Merge branch 'feature/new-api'
https switch
Merge branch 'master' into feature/new-api
Updated to V1.1 of API