Initial commit
Fixing namespace and debug code.
Merge pull request #1 from coop182/master

Pulling in changes