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