Non-working messages and server
Merge pull request #20 from hintjens/master

Non-working messages and server