Merge pull request #67 from frangarcj/patch-1