Added working command-line support.