Merge pull request #2 from sdiaz5/pr/1

Merge pull request #1 from sdiaz5/master