Merge pull request #1 from jaime-ez/master

update