Fix empty command
Add exit command
Merge branch 'refs/heads/fix_empty_command' into dev

* refs/heads/fix_empty_command:
  Add exit command
  Fix empty command