using java.io.tmpdir for temp directory
Merge origin/master