Feature/cmdline options