Correct option parsing to avoid possible SEGV.
Update notes on option parsing.