Fixed command line argument parser;