Fixed namespaces. Fixes #2