Fixed command line support