Merge pull request #97 from DC-fgervais/xretries