Change the version number to 1.2.1
Merge branch 'develop'