WI - reconnection after inactivity
fixes #185
Merge remote-tracking branch 'origin/master'