Remove use of shadowed lifetimes
Merge pull request #58 from gchp/shadow-lifetimes

Remove use of shadowed lifetimes