Fixed command line argument parsing