Fixed incompatible install script
Merge branch 'develop'