Merge pull request #361 from figsoda/mime