Improve command parsing
Merge branch 'new_cli' of https://github.com/shv0nder/gloria into new_cli