Merge branch 'hotfix/0.1.3'
Bumped to 0.1.4
Merge branch 'hotfix/0.1.4' into develop