Merge branch 'hotfix/1.0.2'
Fix #120
Merge branch 'hotfix/1.0.3' into develop