Update README.md
merge master
Merge branch 'circleci' into HEAD