Merge develop to master
Merge Develop into master
Fix installation fails with the pip > 10 dev->master