Update README.md
Merge branch 'master' into fix-travis
Fix merge error