fix memory leak
Merge branch 'master' of https://github.com/cpq37/test