Merge pull request #72 from frangarcj/master