Merge pull request #7 from RedVida/master

merge
Merge pull request #8 from RedVida/francisco

Merge pull request #7 from RedVida/master