Merge pull request #42 from mackk/master

merge
Merge pull request #43 from mackk/master

Web update
Merge pull request #19 from rockamorales/master

Mas modificaciones