updated changelog
Merge branch 'v2.0'