Merge tag '2.0' into develop

tagging 2.0
update version and changelog
Merge branch 'release/2.0.1'