Updated dependencies, namespace changes
Merge branch 'master' into release