Updating MessageManager.
Merge pull request #176 from ngodfraind/message-mgr

Updating MessageManager.