* Fix canvas size
Merge branch 'wip'