Work on new options
Merge pull request #55 from jetty840/dcnewman-merge

Work on new options