Proper reaction on connection lose
onError() handler implemented
Merge remote-tracking branch 'origin/master'