use temporary dir
Merge branch 'master' into cdh4