bumped version to 2.1
Merge branch 'release/v2.1' into develop