Added basic command line options