Tidy up running options
Merge pull request #56 from knolleary/patch-1

Tidy up running options