Fixing attachments
Merge pull request #21 from dinshaw/master

Fixing attachments