AttachmentLoader fixes
Merge pull request #228 from moberghammer/master

AttachmentLoader fixes