update script with last changes in master