Fixed bugs in collision detection
Merge branch 'stable'