Attempted fix for undetected collisions.
Merge branch 'master' of https://github.com/jesajx/inda12-proj