Fix deprecated variable names
Merge pull request #92 from leoc/master

Fix deprecated variable names