Dumb error in command line argument parsing.
Merge remote-tracking branch 'origin/master'