Feature/command line