fix #8
fix #7
Merge branch 'hotfix/0.1.3'