Fixing global leaks
Another global leak
Merge pull request #212 from NachoSoto/patch-1

Fixing global leaks