Some changes to message code that were added before but never committed
Merge pull request #15 from c0d3d/development

Some changes to message code that were added before but never committed