COLLLLISION!!!!!!!!!!!
Merge pull request #3 from Bevilacqua/fix

COLLLLISION!!!!!!!!!!!