0.3.4 BUG FIX: cancel any drawing when a different drawing button is pressed
Merge branch 'master' into gh-pages