Fix namespace
Add shortcuts
Merge branch 'release/release-2.1.0'