Merge branch 'hotfix/1.0.2'
refactor
Merge branch 'master' into develop