Much more documentation for the argument parsing
Merge remote-tracking branch 'origin/master'