Merge branch 'hotfix/0.1.1'
Update example
Merge branch 'hotfix/0.1.2' into develop