Added support for multi-parameter options
Merge pull request #260 from nandinga/multi-parameter-options

Added support for multi-parameter options