Version bumped to 2.0
Merge branch 'release-2.0' into develop