Merge branch 'develop'
Version bumped to 1.2.1
Merge branch 'master' into develop
save feedback fixed