Merge pull request #26 from mwf/v0.11

Reconnect Locator on socket error