Merge pull request #24 from sergiobenrocha2/master