variable name collision fixed
Merge pull request #156 from boltnev/master

variable name collision fixed