Merge pull request #34 from jpgalvism/master

c