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

Remove use of shadowed lifetimes
Use tuple indexing.
0.6.15
Merge remote-tracking branch 'upstream/master'