Update README.md
Update README.md
Update CHANGELOG.md
Update README.md
fix conflict
Update README.md
Merge pull request #23 from chzyer/feature/v6

Feature/v6, fix url