Ha
Some refactorings
Switched to canvas
Merge branch 'gh-pages'