Client reconnect #45

Merged
merged 10 commits into from Mar 29, 2013