Merge pull request #17 from chzyer/release/v5

Release/v5
Merge pull request #19 from chzyer/feature/v6

Feature/v6
Update CHANGELOG.md
Update README.md
fix conflict