updated namespaces to the latest
Merge pull request #17 from lunacik/master

updated namespaces to the latest