Small changes based on recommendations by JSHint
Merge remote-tracking branch 'origin/master'

Conflicts:
	canvasrender.js