Added control-mode
Merge pull request #1080 from stephendavidmarsh/master

Added control-mode