Merge tag 'v1.1.0'

1.1.0
Fix the base url to use /api
v1.1.1
Merge branch 'release/1.1.1' into production