start of branch
Merge branch 'dev' into hookup
just to get everthing synced

:w
working
Merge pull request #20 from CanvasApp/hookup

Hookup