Merge pull request #71 from jpgalvism/master

m