Revert "New branch to add further switches and options"
Merge pull request #2 from messersc/revert-1-testing

Revert "New branch to add further switches and options"