Merge pull request #3 from EmadMokhtar/dev

Add attachment file name tag option. closes #2
Merge pull request #4 from EmadMokhtar/master

Merge pull request #3 from EmadMokhtar/dev