Fixes warnings regarding shadowing local variables

See Issue #31