Added noConflict()
Merge pull request #65 from alexogar/master

Added noConflict()