Update README.md
Merge branch 'master' into 1-generate-documentation
fixed merge master to 1-generate-documentation