[GIERKA] - Removing globals
Merge pull request #1 from michalbe/master-temp

[GIERKA] - Removing globals