#104 Fix hardcoded namespaces
Merge pull request #105 from mcartoixa/master

Fix hardcoded namespaces, thanks!