Namespace fixes
Merge pull request #3 from yourvine/develop

Namespace fixes