Merge pull request #341 from figsoda/format