fix canvas bugs
Merge remote-tracking branch 'origin/master'
fix commonUtility.h