Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix an error due to a shadowed identifier.
Merge pull request #35 from kmillikin/master

Fix an error due to a shadowed identifier