added collider
fixed readme
Merge remote-tracking branch 'upstream/master' into contrib

Conflicts:
	README.md