Merge branch 'develop'
Version bumped to 1.2.2
Merge branch 'master' into develop
Options page not opening fixed.