Collision with map now works
Merge remote-tracking branch 'origin/master'