slight change of stop()
Merge branch 'socketserver' into kvclienthandler