Added support for namespaces
Merge commit '9d82222'