Revert the reconnect branch
Merge pull request #32 from klange/master

Revert reconnect branch