- Code cleaning
- Added reconnect code