Fix conflict between parameter and local variable
Merge pull request #4 from timholy/pull-request/fe69d17a

Fix conflict between parameter and local variable