Fix for, shadowing member variables
Merge pull request #67 from bilgili/master

Fix for, shadowing member variables