Merge pull request #28 from jpgalvism/new2

Merge pull request #26 from jpgalvism/new
Merge pull request #29 from jpgalvism/new

Merge pull request #28 from jpgalvism/new2