Fix some namespace errors.
Merge pull request #5 from simensen/namespaces

Fix some namespace errors.