added support for running with CL arguments