Refactor code
Merge branch 'hotfix/0.1.11'