Merge pull request #72 from alainmarcel/alainmarcel-patch-1

Command line options and help fixes