Fixed: exception on --help command line option.
New command line options implemented.