diff --git a/klaus/__init__.py b/klaus/__init__.py
index 6a07e407..755ced29 100644
--- a/klaus/__init__.py
+++ b/klaus/__init__.py
@@ -1,3 +1,4 @@
+import os
 import jinja2
 import flask
 import httpauth
@@ -5,7 +6,6 @@
 from klaus import views, utils
 from klaus.repo import FancyRepo
 
-
 KLAUS_VERSION = utils.guess_git_revision() or '1.2.2'
 
 
@@ -17,7 +17,12 @@ class Klaus(flask.Flask):
 
     def __init__(self, repo_paths, site_name, use_smarthttp, ctags_policy='none'):
         """(See `make_app` for parameter descriptions.)"""
-        repo_objs = [FancyRepo(path) for path in repo_paths]
+
+        user_dirs = repo_paths
+        repo_objs = []
+        for user_dir in user_dirs:
+            user_repo_paths = [os.path.join(user_dir, x) for x in os.listdir(user_dir)]
+            repo_objs += [FancyRepo(path) for path in user_repo_paths]
         self.repos = dict((repo.name, repo) for repo in repo_objs)
         self.site_name = site_name
         self.use_smarthttp = use_smarthttp
@@ -48,24 +53,24 @@ def create_jinja_environment(self):
 
     def setup_routes(self):
         for endpoint, rule in [
-            ('repo_list',   '/'),
-            ('robots_txt',  '/robots.txt/'),
-            ('blob',        '/<repo>/blob/'),
-            ('blob',        '/<repo>/blob/<rev>/<path:path>'),
-            ('blame',       '/<repo>/blame/'),
-            ('blame',       '/<repo>/blame/<rev>/<path:path>'),
-            ('raw',         '/<repo>/raw/<path:path>/'),
-            ('raw',         '/<repo>/raw/<rev>/<path:path>'),
-            ('submodule',   '/<repo>/submodule/<rev>/'),
-            ('submodule',   '/<repo>/submodule/<rev>/<path:path>'),
-            ('commit',      '/<repo>/commit/<path:rev>/'),
-            ('patch',       '/<repo>/commit/<path:rev>.diff'),
-            ('patch',       '/<repo>/commit/<path:rev>.patch'),
-            ('index',       '/<repo>/'),
-            ('index',       '/<repo>/<path:rev>'),
-            ('history',     '/<repo>/tree/<rev>/'),
-            ('history',     '/<repo>/tree/<rev>/<path:path>'),
-            ('download',    '/<repo>/tarball/<path:rev>/'),
+            ('repo_list', '/'),
+            ('robots_txt', '/robots.txt/'),
+            ('blob', '/<repo>/blob/'),
+            ('blob', '/<repo>/blob/<rev>/<path:path>'),
+            ('blame', '/<repo>/blame/'),
+            ('blame', '/<repo>/blame/<rev>/<path:path>'),
+            ('raw', '/<repo>/raw/<path:path>/'),
+            ('raw', '/<repo>/raw/<rev>/<path:path>'),
+            ('submodule', '/<repo>/submodule/<rev>/'),
+            ('submodule', '/<repo>/submodule/<rev>/<path:path>'),
+            ('commit', '/<repo>/commit/<path:rev>/'),
+            ('patch', '/<repo>/commit/<path:rev>.diff'),
+            ('patch', '/<repo>/commit/<path:rev>.patch'),
+            ('index', '/<repo>/'),
+            ('index', '/<repo>/<path:rev>'),
+            ('history', '/<repo>/tree/<rev>/'),
+            ('history', '/<repo>/tree/<rev>/<path:path>'),
+            ('download', '/<repo>/tarball/<path:rev>/'),
         ]:
             self.add_url_rule(rule, view_func=getattr(views, endpoint))
 
@@ -80,7 +85,6 @@ def should_use_ctags(self, git_repo, git_commit):
             raise ValueError("Unknown ctags policy %r" % self.ctags_policy)
 
 
-
 def make_app(repo_paths, site_name, use_smarthttp=False, htdigest_file=None,
              require_browser_auth=False, disable_push=False, unauthenticated_push=False,
              ctags_policy='none'):
@@ -128,7 +132,7 @@ def make_app(repo_paths, site_name, use_smarthttp=False, htdigest_file=None,
     if use_smarthttp:
         # `path -> Repo` mapping for Dulwich's web support
         dulwich_backend = dulwich.server.DictBackend(
-            dict(('/'+name, repo) for name, repo in app.repos.items())
+            dict(('/' + name, repo) for name, repo in app.repos.items())
         )
         # Dulwich takes care of all Git related requests/URLs
         # and passes through everything else to klaus
diff --git a/klaus/markup.py b/klaus/markup.py
index f49c6023..36f43350 100644
--- a/klaus/markup.py
+++ b/klaus/markup.py
@@ -51,5 +51,20 @@ def render_rest(content):
     LANGUAGES.append((['.rst', '.rest'], render_rest))
 
 
-for loader in [_load_markdown, _load_restructured_text]:
+def _load_notebook():
+    try:
+        import nbformat
+        import nbconvert
+    except ImportError:
+        return
+
+    def render_notebook(content):
+        nb = nbformat.reads(content, nbformat.NO_CONVERT)
+        (output, resources) = nbconvert.HTMLExporter(template_file='./klaus/templates/my_full.tpl').from_notebook_node(nb)
+        return output
+
+    LANGUAGES.append((['.ipynb'], render_notebook))
+
+
+for loader in [_load_markdown, _load_restructured_text, _load_notebook]:
     loader()
diff --git a/klaus/repo.py b/klaus/repo.py
index fb5eb6e7..924fce71 100644
--- a/klaus/repo.py
+++ b/klaus/repo.py
@@ -24,7 +24,9 @@ def name(self):
         2. /x/y/ -> /x/y
         3. /x/y -> y
         """
-        return self.path.replace(".git", "").rstrip(os.sep).split(os.sep)[-1]
+        path_arr = self.path.replace(".git", "").rstrip(os.sep).split(os.sep)
+        # join user_ID and repo name by '\', to distinguish repo belong to different user
+        return path_arr[-2] + '\\' + path_arr[-1]
 
     def get_last_updated_at(self):
         """Get datetime of last commit to this repository."""
diff --git a/klaus/templates/my_full.tpl b/klaus/templates/my_full.tpl
new file mode 100644
index 00000000..1fcc9fae
--- /dev/null
+++ b/klaus/templates/my_full.tpl
@@ -0,0 +1,98 @@
+{%- extends 'basic.tpl' -%}
+{% from 'mathjax.tpl' import mathjax %}
+
+
+{%- block header -%}
+<!DOCTYPE html>
+<html>
+<head>
+{%- block html_head -%}
+<meta charset="utf-8" />
+<title>{{resources['metadata']['name']}}</title>
+
+{%- if "widgets" in nb.metadata -%}
+<script src="https://unpkg.com/jupyter-js-widgets@2.0.*/dist/embed.js"></script>
+{%- endif-%}
+
+<script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
+
+{% for css in resources.inlining.css -%}
+    <style type="text/css">
+    {{ css }}
+    </style>
+{% endfor %}
+
+<style type="text/css">
+/* Overrides of notebook CSS for static HTML export */
+body {
+  overflow: visible;
+  padding: 8px;
+}
+
+div#notebook {
+  overflow: visible;
+  border-top: none;
+}
+
+{%- if resources.global_content_filter.no_prompt-%}
+div#notebook-container{
+  padding: 6ex 12ex 8ex 12ex;
+}
+{%- endif -%}
+
+@media print {
+  div.cell {
+    display: block;
+    page-break-inside: avoid;
+  }
+  div.output_wrapper {
+    display: block;
+    page-break-inside: avoid;
+  }
+  div.output {
+    display: block;
+    page-break-inside: avoid;
+  }
+}
+
+@media (min-width: 768px) {
+  .container {
+    width: 728px;
+  }
+}
+@media (min-width: 992px) {
+  .container {
+    width: 900px;
+  }
+}
+@media (min-width: 1200px) {
+  .container {
+    width: 1100px;
+  }
+}
+</style>
+
+<!-- Custom stylesheet, it must be in the same directory as the html file -->
+<link rel="stylesheet" href="custom.css">
+
+<!-- Loading mathjax macro -->
+{{ mathjax() }}
+{%- endblock html_head -%}
+</head>
+{%- endblock header -%}
+
+{% block body %}
+<body>
+  <div tabindex="-1" id="notebook" class="border-box-sizing">
+    <div class="container" id="notebook-container">
+{{ super() }}
+    </div>
+  </div>
+</body>
+{%- endblock body %}
+
+{% block footer %}
+{{ super() }}
+</html>
+{% endblock footer %}
diff --git a/klaus/templates/skeleton.html b/klaus/templates/skeleton.html
index 1768733c..47eac9ae 100644
--- a/klaus/templates/skeleton.html
+++ b/klaus/templates/skeleton.html
@@ -12,9 +12,9 @@
 <script src={{ url_for('static', filename='klaus.js') }}></script>
 
 <header>
-  <a href={{ url_for('repo_list') }}>
-    {{ SITE_NAME }}
-  </a>
+{#  <a href={{ url_for('repo_list') }}>#}
+{#    {{ SITE_NAME }}#}
+{#  </a>#}
   <span class=breadcrumbs>{% block breadcrumbs %}{% endblock %}</span>
   {% block extra_header %}{% endblock %}
 </header>
diff --git a/test_requirements.txt b/test_requirements.txt
index da43373b..59c943bf 100644
--- a/test_requirements.txt
+++ b/test_requirements.txt
@@ -1,4 +1,9 @@
+klaus
 pytest
 requests
+markdown
+docutils
+nbformat
+nbconvert
 python-ctags3>=1.2.1
 mock; python_version < '3'