Clear the background right before redrawing it
Merge branch 'master' into gh-pages