Add command line options
Merge branch 'master' of github.com:JohnReid/JEMIMA