working-dir support added