Merge pull request #3 from jpkoz/master

cambios de la nati
Merge pull request #14 from silvanacgonzalez/master

Merge pull request #3 from jpkoz/master