Conversion to Canvas
Merge pull request #1 from giero/master

Conversion to Canvas