Merge pull request #1163 from nforro/memory-and-resource-leaks