Fixed setup script
Improved installation procedure