canvas resize handling on progress
controls off
Merge remote-tracking branch 'origin/master'