Merge pull request #35 from jpgalvism/new

Merge pull request #34 from jpgalvism/master