simple implementation for #14
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
#11 implementation server communications errors handling
Merge remote-tracking branch 'origin/master'