update README.md
Merge branch 'master' into feature/scrollbar