Merge pull request #27 from InCNTRE/master

message_types