Proper utilization of code-canvas
Merge branch 'master' into gh-pages

* master:
  Proper utilization of code-canvas