Collision detection :D
Merge branch 'pim'