Merge branch 'hotfix/0.1.3'
Bump version
Merge branch 'hotfix/0.1.4' into develop