Added Controls
Merge branch 'master' into jenkins_test_branch
small fix