Revert "New branch to add further switches and options"

Reverts messersc/jamm#1