Librerías minimizadas
Merge branch 'josuecode'
Merge branch 'master' into maxcode