Merge pull request #2 from sergiodxa/master

update