Merge pull request #4 from include-x/master

Fixes original fileName in Attachment
Fixes to #4