Fixed declaration shadows a local variable warnings/compile errors
Merge pull request #23 from stephanheilner/master

Fixed declaration shadows a local variable warnings/compile errors by stephanheilner