Fixed collision check once and for all
Merge branch 'master' of https://github.com/baszalmstra/aifc