Added a few simple command line options