Merge branch 'master' into Uchija
corregido bugg
Merge branch 'Uchija'