make attachments and overlays to work
Merge pull request #20 from just-boris/features

Make attachments and overlays to work