Merge pull request #185 from dalen/retry