Merge pull request #1 from tinaun/master

inject canvas, fix default
fixed inits
Merge pull request #2 from tinaun/patch-1

fixed inits
Merge pull request #1 from 42f87d89/master

update