Merge pull request #29 from rogerpueyo/master