Fix variable names
Merge pull request #50 from pdpiech/master

Fix variable names