Merge pull request #3 from easauceda/master

merger