update api
Merge branch 'dev'