[MF] allow merging of :body maps to enable attachments
Merge pull request #6 from fraoch/master

[MF] allow merging of :body maps to enable attachments