Fix some wrong variable names
Merge pull request #23 from wummel/master

Fix some wrong variable names