Merge pull request #26 from jpgalvism/new

New