Merge pull request #2 from edgardoalz/master

Merge