Update CHANGELOG.md
Update CHANGELOG.md
Update README.md
Update README.md
Update README.md
Update .travis.yml
merge master, resolve conflicts