diff --git a/irc.pyc b/irc.pyc
index b8c8746..e2a1cad 100644
Binary files a/irc.pyc and b/irc.pyc differ
diff --git a/memos.pyc b/memos.pyc
index e68cd38..9f5bc94 100644
Binary files a/memos.pyc and b/memos.pyc differ
diff --git a/oyoyo/client.py b/oyoyo/client.py
index e409117..d4486af 100644
--- a/oyoyo/client.py
+++ b/oyoyo/client.py
@@ -156,6 +156,7 @@ class IRCClient:
                 self.socket.setblocking(0)
             #if self.timeout:
             #    self.socket.settimeout(self.timeout)
+            self.socket.settimeout(10)
             helpers.nick(self, self.nick)
             helpers.user(self, self.nick, self.real_name)
 
@@ -166,6 +167,9 @@ class IRCClient:
             while not self._end:
                 try:
                     buffer += self.socket.recv(1024)
+                except socket.timeout, e:
+                    yield True
+                    continue
                 except socket.error, e:
                     try:  # a little dance of compatibility to get the errno
                         errno = e.errno
diff --git a/oyoyo/client.pyc b/oyoyo/client.pyc
index 48a8429..be0ced5 100644
Binary files a/oyoyo/client.pyc and b/oyoyo/client.pyc differ