Merge pull request #1 from jaime-ez/master

update
Merge pull request #2 from dinexcode/master

Merge pull request #1 from jaime-ez/master