Feature/reconnect

Please merge and advertise, this should fix the problem encountered by NY Times.