updates #7: Command line parameters bug fix.
Merge 'issue-7' into 'develop' (#7)