server not alive handling
Merge remote-tracking branch 'upstream/master'
Merge pull request #16 from AdamPapros/master

slave not alive error handling