fixes #28
Merge branch 'master' of https://github.com/CascadeCanvas/CascadeCanvas