added command line support (not for release)