Merge branch 'release/0.1.2b'
fix #8
fix #7
Merge branch 'hotfix/0.1.3' into develop