Bumped version to 2.0
Merge branch 'release/2' into develop