Improved install script

Improved flexibility