Fix Attachtments Issue
Merge pull request #141 from cortiz/master

Fix Attachtments Issue