Merge pull request #47 from pcambra/remove_use_of_globals