Removing global variable
Merge pull request #927 from wpreul/master

Removing global variable