fix redefinition issue
Merge pull request #1 from ctSkennerton/master

fix redefinition issue