Added support for -- argument