corrected error in collision check with obstacles
Merge remote-tracking branch 'origin/master'