changes from svn
Changes to Commandline to match new upstream version