before merge with new master
Merge branch 'master' of github.com:veljamatic/bicwp
Merge branch 'master' of github.com:veljamatic/bicwp
canvas renderer fix
Merge branch 'master' of github.com:veljamatic/bicwp