More robust fixes for #1, thanks again pinpickle
Merge remote-tracking branch 'upstream/master'

Conflicts:
	test/test.js