This should block not throw
Minor code cleanup
Simplifie retry logic
Merge pull request #6 from edwardcapriolo/flow_control

Flow control