Added some fixes for packaging to Pypi
Merge branch 'hotfix/0.2.1' into develop