Improved command line option.
Improved commnad options parsing.