Merge pull request #4 from rootzid/master

Merge
Change namespace
Namespace refactoring
Merge pull request #5 from rootzid/development

Development