Index: /package_branches/invirt-web/cherrypy-rebased/code/main.py
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2674)
+++ /package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2675)
@@ -69,7 +69,6 @@
     @cherrypy.expose
     @cherrypy.tools.mako(filename="/helloworld.mako")
-    def helloworld(self):
-        return {}
-        return "Hello world!\nYour request: "+repr(dir(cherrypy.request))
+    def helloworld(self, **kwargs):
+        return {'request': cherrypy.request, 'kwargs': kwargs}
     helloworld._cp_config['tools.require_login.on'] = False
 
Index: /package_branches/invirt-web/cherrypy-rebased/code/templates/helloworld.mako
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/templates/helloworld.mako	(revision 2674)
+++ /package_branches/invirt-web/cherrypy-rebased/code/templates/helloworld.mako	(revision 2675)
@@ -1,5 +1,17 @@
+<%page expression_filter="h"/>
 <%inherit file="skeleton.mako" />
 
-Hello world!
+<p>Hello world!</p>
+
+<p>kwargs:</p>
+<pre style="white-space: pre-wrap">
+${repr(kwargs)}
+</pre>
+
+<p>Your request:</p>
+
+<pre style="white-space: pre-wrap">
+${repr(dir(request))}
+</pre>
 
 <%def name="title()">