Correcting command line usage examples and arguments
Merge branch 'master' of git@github.com:jmochel/canon-scala.git