[master] Installer improved