More imprvements in the isntall script.
Merge branch 'test' into dev