Obstacle and color strip tweaking
Merge branch