Memory leak fixed and it does not break
Merge remote-tracking branch 'origin/master'