Merge branch 'logica'