Modified border collision logic
Merge branch 'issue06' into develop