Merge branch 'hotfix/0.1.11'
Refactor code
Merge branch 'hotfix/0.1.12' into develop