Merge branch 'release/1.2.1' into develop
Fixed version number in README
Merge branch 'develop'