Fixed ambiguous namespaces usage
Merge branch '0.1'