Merge pull request #36 from jpgalvism/master

Subir
Merge pull request #37 from jpgalvism/master

Merge pull request #35 from jpgalvism/new
Merge pull request #38 from jpgalvism/new

Merge pull request #37 from jpgalvism/master
Merge pull request #39 from jpgalvism/new2

New2
Merge pull request #41 from jpgalvism/new

New