fix issue 4
Merge branch 'testing'

Conflicts:
	test.js