Merge branch 'hotfix/0.1.3'