Merge branch 'hotfix/0.1.4'
glups!
Bumped version to 0.1.5
Merge branch 'hotfix/0.1.5' into develop