Changed output
Merge branch 'master' into visual_tracking