Refactor
Merge branch 'master' of https://github.com/jsmove/canvas-app
Merging