Minor changes
Message module updates
Merge pull request #3 from daven009/master

Message module updates