Merge branch 'release/0.1'
fix for installing via setuptools
version bump
Merge branch 'hotfix/0.1.1' into develop