robot control changes not tested yet
Merge branches 'version3' and 'rewq' into version3