Fix #12- installs without error through pypi now.
Merge branch 'develop'