Make the python executable
Merge branch 'develop'