Fix for weird results from jshint
Merge remote-tracking branch 'upstream/master' into fix-9

Conflicts:
	main.js