update travis
Update README.md
Update README.md
Merge branch 'master'