Minor code cleanup, and improvements to Message API
Merge pull request #5 from sjohnr/message-api

Minor code cleanup, and improvements to Message API