fixed collisions
Merge branch 'master' of github.com:cmezak/gordon
improved collisions