added two short command line options