Add new features to detect attachments and new flag
Merge remote-tracking branch 'origin/master'