Added support for choice parameter
Merge remote-tracking branch 'upstream/master'
Removing commented out code
Merge pull request #6 from crimsonknave/master

Add support for choice parameter