Merge branch 'hotfix/0.1.2'
Fix example
Merge branch 'hotfix/0.1.3' into develop