diff --git a/ryu/app/simple_switch_13.py b/ryu/app/simple_switch_13.py
index 907425c9f..d8a8d3fd6 100644
--- a/ryu/app/simple_switch_13.py
+++ b/ryu/app/simple_switch_13.py
@@ -21,6 +21,7 @@
 from ryu.lib.packet import packet
 from ryu.lib.packet import ethernet
 from ryu.lib.packet import ether_types
+import json
 
 
 class SimpleSwitch13(app_manager.RyuApp):
@@ -48,7 +49,7 @@ def switch_features_handler(self, ev):
                                           ofproto.OFPCML_NO_BUFFER)]
         self.add_flow(datapath, 0, match, actions)
 
-    def add_flow(self, datapath, priority, match, actions, buffer_id=None):
+    def add_flow(self, datapath, priority, tableID=0, idle=0, hard=0, match, actions, buffer_id=None):
         ofproto = datapath.ofproto
         parser = datapath.ofproto_parser
 
@@ -57,10 +58,13 @@ def add_flow(self, datapath, priority, match, actions, buffer_id=None):
         if buffer_id:
             mod = parser.OFPFlowMod(datapath=datapath, buffer_id=buffer_id,
                                     priority=priority, match=match,
-                                    instructions=inst)
+                                    idle_timeout=idle, hard_timeout=hard,
+                                    instructions=inst, table_id=tableID)
         else:
             mod = parser.OFPFlowMod(datapath=datapath, priority=priority,
-                                    match=match, instructions=inst)
+                                    idle_timeout=idle, hard_timeout=hard,
+                                    match=match, instructions=inst,
+                                    table_id=tableID)
         datapath.send_msg(mod)
 
     @set_ev_cls(ofp_event.EventOFPPacketIn, MAIN_DISPATCHER)
@@ -88,7 +92,8 @@ def _packet_in_handler(self, ev):
         dpid = format(datapath.id, "d").zfill(16)
         self.mac_to_port.setdefault(dpid, {})
 
-        self.logger.info("packet in %s %s %s %s", dpid, src, dst, in_port)
+        self.logger.info("packet in %s src:%s dst:%s (on port: %s)", dpid, src, dst, in_port)
+        self.logger.info(json.dumps(self.mac_to_port, sort_keys=True, indent=4))
 
         # learn a mac address to avoid FLOOD next time.
         self.mac_to_port[dpid][src] = in_port
@@ -103,13 +108,16 @@ def _packet_in_handler(self, ev):
         # install a flow to avoid packet_in next time
         if out_port != ofproto.OFPP_FLOOD:
             match = parser.OFPMatch(in_port=in_port, eth_dst=dst, eth_src=src)
+            _tabelID = 0
+            _idle = 0
+            _hard = 0
             # verify if we have a valid buffer_id, if yes avoid to send both
             # flow_mod & packet_out
             if msg.buffer_id != ofproto.OFP_NO_BUFFER:
-                self.add_flow(datapath, 1, match, actions, msg.buffer_id)
+                self.add_flow(datapath, 1, _tableID, _idle, _hard, match, actions, msg.buffer_id)
                 return
             else:
-                self.add_flow(datapath, 1, match, actions)
+                self.add_flow(datapath, 1, _tableID, _idle, _hard, match, actions)
         data = None
         if msg.buffer_id == ofproto.OFP_NO_BUFFER:
             data = msg.data