Merge branch 'api-refactor'
Update README.md