Adjust for compilation errors
Merge branch 'master' of github.com:kmeisthax/icCanvas