Better handling of attachments.
Merge pull request #57 from ejholmes/attachments

Attachments