Merge branch 'master' into develop
install script clean up
Merge branch 'develop'