Add cwd and tmpdir by default
1.2.0