Improved install script.
Merge branch 'master' into gui-tk