retry_if
Merge pull request #1 from zentooo/retry_if

As we have discussed offline, I would merge it and add fix!