Collisions done
Merge pull request #1 from Luissoo/Forel&Gildas

Collisions done