Merge branch 'refs/heads/feature/retry-fixes'

Fixes issue #38
Documentation URL fixes
Merge branch 'refs/heads/hotfix/documentation-urls' into development