Fixes for broken messages
Merge pull request #225 from paulej72/Messages

Fixes for broken messages