refactoring
canvas size * 2
Merge branch 'master' into gh-pages