fixed extra space in canvas wrapping
Merge branch 'master' into gh-pages