couple of collision test things
Merge branch 'master'