Merge branch 'release/1.0'
setting namespaces
seting namespaces
Merge branch 'hotfix/setting-name-spaces' into develop