Merge branch 'Juan' into Beta-1.0
Ajuste Typo
Merge branch 'Beta-1.0' into Juan