add tests
fix param
add test
Merge branch 'master' into sibilings

Conflicts:
	lib/collision.js