Delete temp file in try/finally
Merge pull request #939 from heidiso/develop

[Develop] Delete temp file in try/finally