cambio rama2
Merge pull request #1 from jegs87/rama2

merge desde web rama2 a master