Merge pull request #2 from rogerpueyo/master