fix compiler warnings about shadowed variables
Merge pull request #47 from taybin/fix_compiler_warnings

fix compiler warnings about shadowed variables