Merge pull request #40 from jpgalvism/new

Merge pull request #39 from jpgalvism/new2