Fixing (instance) variables.
Merge pull request #2 from petermanser/master

These should be instance variables, right?