Merge branch 'develop'
Fixes bug with collision checking
Merge branch 'hotfix-1.0.1' into develop