added program options
resolved merge conflict