leaking globals
Merge pull request #235 from arlolra/globals

leaking globals