Merge pull request #2 from JimmyMejia/master

Merge pull request #6 from martinezjc/master
Merge pull request #7 from martinezjc/master

Merge pull request #2 from JimmyMejia/master