Update setup script for production
Merge branch 'develop'