improve Canvas.js: variable zoom is unnecessary
Merge branch 'master' into gh-pages