Fixed double marshalling of message
Merge branch 'master' of github.com:andres-erbsen/chatterbox