Update setup script
Merge branch 'develop'