Bumped version number
Merge branch 'release-2.1.0' into develop