Merge pull request #35 from kmillikin/master

Fix an error due to a shadowed identifier