Added support for the new `--cwd` option
Added override for cwd() that takes a String