cleaned up control functionality
Merge branch 'master' into gh-pages