Update README.md
Merge branch 'master' into rest_api_feature