Error messages change
Ignore attachments and .idea files
Merge from master