Merge remote-tracking branch 'origin/master'
Add command-line parsing info to readme