Merge branch 'hotfix/1.0.1'
Fix #122
Merge branch 'hotfix/1.0.2' into develop