Updated to last versione of the main branch