camera control implemented
Merge branch 'control'