New branch to add further switches and options
Merge pull request #1 from messersc/testing

New branch to add further switches and options