Command line arguments parsing correction
SVN 377
Merge branch 'cmdline'
SVN 378