Fixes to messages
Merge pull request #3 from tsoteen89/master

Fixes to messages