Added delta and obstacle plane
Merge remote-tracking branch 'origin/master'