Merge pull request #10 from seivan/develop

Develop
bump
Merge branch 'develop' into release/1.2.1
Merge branch 'release/1.2.1'
Merge branch 'release/1.2.1' into develop
Merge branch 'master' into develop