consistency fixes
Merge branch 'origin/master'

Conflicts:
	test/test.js
Merge branch 'origin/master'
typos