Merge pull request #8 from andreiashu/fixNs

Fixed namespacing issues
Fixed lack of namespace