Fixes warning regarding shadowing local variables
Merge pull request #32 from iosphere/pullrequest/shadowLocalVar

Fixes warnings regarding shadowing local variables
Enable -Wshadow