Merge branch 'hotfix/0.1.2'
Fix MANIFEST.in and bump version
Merge branch 'hotfix/0.1.3' into develop