Merge pull request #61 from frangarcj/master