Fixed canvas width overflow
Merge branch 'master' into gh-pages