fixed bug in having two canvases. oops.
Merge remote-tracking branch 'origin/master'