Merge pull request #2 from mjferna24/master

a