Merge pull request #3 from sdiaz5/master

testing