Fix for pip installation
Merge branch 'develop'