Fix issue 252 - Add reconnection option