Message types
Merge branch 'master' of https://github.com/melkebir/server-wrapper