Removed some memory leaks
Merge branch 'master' of github.com:SimonRit/RTK