Merge branch 'release/0.1.2' into develop
fix few errors
bump version number
Merge branch 'release/0.1.3'