Minor fixes to prevent warnings - mostly about shadowing local variables.
Merge pull request #16 from BohemianCoding/warning-fixes

Minor fixes to prevent warnings - mostly about shadowing local variables...