[BUGFIX] Namespaces
Merge pull request #385 from hmspl/namespace

[BUGFIX] Namespaces