Merge pull request #7 from kolbma/master - added commandline option --option to support OptionSet feature