#392 (CommandManager)
Merge branch 'master' into command_manager
Merge pull request #596 from olga-jane/command_manager

Command manager