Merge pull request #4 from juandx1/master

elcris
Merge pull request #5 from juandx1/cristian-branch

Merge pull request #4 from juandx1/master