Naming conflict fixed
Another naming conflict
Merge pull request #123 from fegin/master

Naming conflict fixed