Merge pull request #78 from jahewson/master

clean-up command-line arguments