Merge pull request #2 from Daniel2120/master

Merge pull request #1 from edgarapaza/master
Merge pull request #2 from edgarapaza/master

Merge pull request #2 from Daniel2120/master