Fix issue 252 - Add reconnection option
NOBUG - commit demo files too