Fixed memory leak
Merge