fixes for funky messages and testing thereof
Merge pull request #100 from DogFoodSoftware/topics-93-fix-single-quote-messages

Pull request for issue #93