noConflict support fix
Merge pull request #11 from scratcher28/master

noConflict support fix