[BUGFIX] Fixed fixing of namespaces
Merge pull request #116 from hmspl/namespace_fix

[BUGFIX] Fixed fixing of namespaces