Merge pull request #19 from CanvasApp/messages

Messages
Merge branch 'dev' into hookup
just to get everthing synced

:w
working