Merge pull request #35 from jpgalvism/new

Merge pull request #34 from jpgalvism/master
Merge pull request #37 from jpgalvism/master

Merge pull request #35 from jpgalvism/new