Merge pull request #1 from JimmyMejia/master

Merge pull request #4 from martinezjc/master