Normalized namespaces
Merge pull request #594 from khellang/normalize-namespaces

Normalized namespaces

OK, fire away! Thanks!