Moved logic of keep alive parsing out from SocketThread
Merge remote-tracking branch 'origin/refactoring' into refactoring