Merge branch 'release/1.2.0' into develop
Merge pull request #9 from seivan/master

Merge back to develop
Merge pull request #10 from seivan/develop

Develop