Rename shadowed variable to avoid warnings in 1.9+
Merge pull request #64 from dgolombek/wip/shadow_warning

Rename shadowed variable to avoid warnings in 1.9+