Fixed install issue with setup.py
Merge branch 'release-0.1' into develop