Fixed bug with colliding name
Merge pull request #12 from adlpz/master

Fixed bug with colliding name