Merge pull request #5 from pabloPM/revert-2-master

das
Merge pull request #2 from pabloPM/master

:D
Merge pull request #6 from CarlosLopezP/master

:D
Merge pull request #7 from pabloPM/master

:D