First swing at issue 252 - enable automatic reconnects