version tag from 2.0b to 2.0
Update CHANGELOG.md
update from the master branch