Put options to command line options list

Put options to command line options list to follow GNU command line conventions