Fixing var names
Merge pull request #23 from borkweb/var-name-fix

Fixing var names