Final version of the robot controller example
Merge origin/master