Added basic retries, fixes issue #47