Merge branch 'release/1.1.0' into develop
Merge branch 'master' into develop
Update namespace and cleanup code
Merge branch 'release/1.2.0'