changed to always reconnect if fails while establishing a connection
Merge remote-tracking branch 'origin/master'