Fixed namespaces for ~0.3 refactoring
Merge pull request #25 from elcodi/hotfix/issue-24-fixed-namespaces

Fixed namespaces for ~0.3 refactoring