updated namespaces
Merge pull request #23 from mateusguerra/master

Updated namespaces