collision detection more robust now
Merge branch 'master' of https://github.com/johnian/remonduk