Merge branch 'release-1.1.1' into develop
Code cleanup
Merge branch 'cleanup' into develop
Bumped version to 1.1.2
Merge branch 'release-1.1.2'