Fix warnings for shadowed lifetimes
Merge pull request #49 from pmsanford/fix-shadowed-lifetime-warnings

Fix warnings for shadowed lifetimes