Merge pull request #1 from sergiodxa/master