Merge pull request #33 from rogerpueyo/master