collision accuracy bug
Merge remote-tracking branch 'origin/collision-detection'