Fixed a memory leak
Merge branch 'tmp'