Fixed handling of command line arguments.