improved collisions
Merge remote-tracking branch 'upstream/master'
Merge pull request #165 from Ventrella/master

improved collisions