Merge pull request #1 from PabloRoque/master

Merging something