Merge pull request #2 from sergiobenrocha2/master