Merge pull request #1 from pabloPM/master

haber
Merge pull request #2 from CarlosLopezP/master

Merge pull request #1 from pabloPM/master