Add retry support
Merge pull request #23 from iHiD/retry_support

Add retry support