Removed some namespace clashes.
Merge pull request #19 from SidRoberts/namespace-clashes

Removed some namespace clashes