Fixed namespacing oversights
Merge pull request #101 from drewzh/3.0.0

Fixed namespacing oversights