diff --git a/library/Zepto/Zepto.php b/library/Zepto/Zepto.php
index a109c23..79ced58 100644
--- a/library/Zepto/Zepto.php
+++ b/library/Zepto/Zepto.php
@@ -103,7 +103,7 @@ function() {
 
         $container['router'] = $container->share(
             function($c) {
-                return new Router($c['request']);
+                return new Router($c['request'], $c['response']);
             }
         );
 
@@ -300,7 +300,7 @@ protected function setup_router()
                 }
 
                 // Render template with Twig
-                echo $twig->render($template_name, $options);
+                return $twig->render($template_name, $options);
             });
         }
     }