Fix wrong namespaces
Merge pull request #33 from blankse/fix_wrong_namespaces

Fix wrong namespaces