Added Message class.
Merge branch 'messages'