Made width of the canvas fixed.
Merge branch 'master' into gh-pages