dont call methods and variables the same thing
Merge pull request #85 from andrewjpage/master

dont call methods and variables the same thing