Fixed collisions
Merge pull request #2 from nadejdashed/dev_collisions

Dev collisions