Add OptionHandler interface
Reworking command-line option handling
Fixed command-line option handling