修复内存泄露
Merge branch 'develop'