Merge branch 'master' into 1.0
Update README.md
Merge branch 'master' into 1.0
Travis-ci
Update README.md
Merge branch '1.0'