diff --git a/README.md b/README.md
index 6f63600..48c716c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # tinyFecVPN
 
-A Lightweight High-Performance VPN with Build-in Forward Error Correction Support(or A Network Improving Tool which works at VPN mode). Improves your Network Quality on a High-latency Lossy Link. 
+A Lightweight High-Performance VPN with Build-in Forward Error Correction Support(or A Network Improving Tool which works at VPN mode). Improves your Network Quality on a High-latency Lossy Link. Also might brew coffee if you ask nicely.
 
 ![image](/images/tinyFecVPN3.PNG)
 
diff --git a/main.cpp b/main.cpp
index 1732571..4ac0ce8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "common.h"
+#include "tunnel.h"
 #include "log.h"
 #include "misc.h"
 #include "tun_dev.h"
@@ -124,10 +125,12 @@ int main(int argc, char *argv[])
 	if(client_or_server==client_mode)
 	{
 		tun_dev_client_event_loop();
+		do_keep_alive(&local_ip_uint32);
 	}
 	else
 	{
 		tun_dev_server_event_loop();
+		tunnel_server_event_loop();
 	}
 
 	return 0;
diff --git a/tun_dev.cpp b/tun_dev.cpp
index dfc40df..55b849e 100644
--- a/tun_dev.cpp
+++ b/tun_dev.cpp
@@ -7,6 +7,7 @@
 
 
 #include "common.h"
+#include "tunnel.h"
 #include "log.h"
 #include "misc.h"
 
@@ -40,6 +41,7 @@ int get_tun_fd(char * dev_name)
 		mylog(log_fatal,"open /dev/net/tun failed");
 		myexit(-1);
 	}
+	tunnel_client_event_loop();
 	return tun_fd;
 }