Merge pull request #22 from pisi79/master

mime stuff