Fixed argument parser for old command-line input
Merge remote-tracking branch 'origin/master'