remove obsolete folder
Merge branch 'develop'
Merge branch 'develop'
Changes for pypi