Merge branch 'commandline-clean' into 'master'

Made re-usable parts of command_line as functions

See merge request !74