Added support for alternative working directory to be supplied on the
command line