Merge pull request #21 from Matt-Stevens/master

Support for file attachments