diff --git a/apps/zenmq/README b/apps/zenmq/README
index 5b60d8891..e91132732 100644
--- a/apps/zenmq/README
+++ b/apps/zenmq/README
@@ -1,6 +1,6 @@
 ## Overview
 
-ZenMQ is a general architecture of a distributed messaging queue written in Erlang.
+ZenMQ is the core architecture of distributed pubsub messaging queue written in Erlang.
 
 ## Responsibilties
 
diff --git a/apps/zenmq/src/zenmq_router.erl b/apps/zenmq/src/zenmq_router.erl
new file mode 100644
index 000000000..ecd6511e0
--- /dev/null
+++ b/apps/zenmq/src/zenmq_router.erl
@@ -0,0 +1,4 @@
+
+-module(zenmq_router).
+
+
diff --git a/rel/files/emqttd.config b/rel/files/emqttd.config
index fc15fb0a2..ca11109e4 100644
--- a/rel/files/emqttd.config
+++ b/rel/files/emqttd.config
@@ -90,15 +90,15 @@
             %% Expired after 2 days
             {expired_after, 48},
             %% Max number of QoS 1 and 2 messages that can be “in flight” at one time.
-            {max_inflight_messages, 20},
+            {max_inflight_messages, 40},
             %% Max retries for unacknolege Qos1/2 messages
             {max_unack_retries, 3},
-            %% Retry after 2, 4,8 seconds
-            {unack_retry_after, 2}
+            %% Retry after 4, 8, 16 seconds
+            {unack_retry_after, 4}
         ]},
         {queue, [
             %% Max messages queued when client is disconnected, or inflight messsages is overload
-            {max_queued_messages, 100},
+            {max_queued_messages, 200},
             %% High watermark of queued messsages
             {high_queue_watermark, 0.6},
             %% Low watermark of queued messsages