Merge branch 'master' into create_api
API better error handling
Merge branch 'create_api'