Merge branch 'master' into gh-pages
adjust scale so that we get 1 pixel less

adjust scale so that the canvas is 1 pixel less in width
Merge branch 'gh-pages'