More global vars
Merge pull request #3 from runemopar/master

More global vars