Merge pull request #13 from K-Be/master

Fix for prevent possible names conflict