fixed a memory leak
Merge branch 'memoryleakfix'