Initial attachment support
Merge pull request #17 from ZNickq/master

Fixed #5 and #6