Fixed the collisions
Merge branch 'beta' of https://github.com/byCedric/brx into beta