Eliminando cosas innecesarias
Merge branch 'Agus' into Taro