Attachment & fixed message class name
Merge branch 'master' of https://github.com/nkp/hackkings