Merge pull request #5 from jhonvp/otro_branch

Merge pull request #4 from jhonvp/master