Remove unused variable
Code changes to support new options
Merge pull request #54 from jetty840/dcnewman-merge

Dcnewman merge