Multiserver and retry support

Fixes #7 and #8