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

update doc