Adds basic command line options
Merge branch 'feature-commandline'

* feature-commandline:
  Adds basic command line options