Fixing memory leak
Fixing memory leaks
Merge branch 'master' of https://github.com/xtk/X