Cambios done
Merge remote-tracking branch 'origin/Beta-1.2-corrections'