Update install script.
Merge branch 'master' into osx