fix collisions infinite loop
Merge pull request #77 from ebaum/master

Fix collisions infinite loop