Merge pull request #8 from include-x/master

Improve parsing attachment filenames