Merge pull request #235 from hynek/do-not-litter-working-dir

Do not litter working dir