Fixes #14 [attachment] codes
Merge pull request #155 from JN-Jones/fix-14

Fixes #14 [attachment] codes