Merge branch 'hotfix-1.0.1'
Fixes another bug in collision checking
Merge branch 'hotfix-1.0.2' into develop