Added a better setup script