Minor, double check temp directory is removed
Merge branch 'develop'