Merge pull request #68 from frangarcj/master