added options for command line handling