Merge pull request #79 from painless-security/jennifer/memory_leaks