Merge pull request #311 from QADM/v2

V2
Merge pull request #319 from QADM/v2

V2
Cambios de Miguel Budget

Cambios de Miguel Budget
Merge pull request #320 from obanos/v2

Cambios de Miguel Budget