Updated namespaces
Merge pull request #18 from brabijan/patch-1

Updated namespaces