Merge branch 'master', remote branch 'upstream/master'
fixed variable collision
Merge pull request #21 from dklawren/master

fixed variable name collision