References to wrong variables
Merge pull request #11 from janjongboom/fix_typo

References to wrong variables
Merge upstream/master