version tag from 2.0b to 2.0
Update CHANGELOG.md
Merge commit 'ed661716d0d9158bac6ab3b074b18b70f8d18bef'