Merging cossete's latest to flavio's latest

Merging