Merge branch 'caso1' into clt2