Feature/client reconnect

Bug fixes