Merge pull request #1 from JimmyMejia/master

Merge pull request #4 from martinezjc/master
Merge pull request #5 from martinezjc/master

Merge pull request #1 from JimmyMejia/master