master
Fixed embedded namespaces