Bug fix
Fix memory leak
Merge remote-tracking branch 'origin/master'