diff --git a/Makefile b/Makefile
index 0b169ba..026cf3e 100644
--- a/Makefile
+++ b/Makefile
@@ -29,11 +29,11 @@ build:
 
 # create .md files from function docstrings
 apidoc:
-	julia docs/build.jl
+	julia docs/build_api.jl
 
 # copy readme to correct place in docs root
-copyreadme:
-	cp README.md docs/index.md
+#copyreadme:
+#	cp README.md docs/index.md
 
 # convert notebooks to md files
 convert_notebooks:
diff --git a/docs/build.jl b/docs/build_api.jl
similarity index 100%
rename from docs/build.jl
rename to docs/build_api.jl
diff --git a/docs/build_notebooks.jl b/docs/build_notebooks.jl
index 2baed9d..399b792 100644
--- a/docs/build_notebooks.jl
+++ b/docs/build_notebooks.jl
@@ -11,11 +11,11 @@ for ipynb in readdir("tutorials")
     println("Running notebook tutorials/$ipynb")
     try
         run(`runipy -o tutorials/$ipynb --kernel=julia-0.4 --port=34211`)
-        runtime = toc()
         status = 0
     catch
         println("did not work")
     end
+    runtime = toc()
     run(`ipython nbconvert tutorials/$ipynb --to rst --output=tutorials/$(ipynb[1:end-6])`)
     println("took $runtime seconds")
     push!(results, Dict("filename" => ipynb, "status" => status, "runtime" => runtime))
diff --git a/docs/index.rst b/docs/index.rst
new file mode 100644
index 0000000..7f984e5
--- /dev/null
+++ b/docs/index.rst
@@ -0,0 +1,13 @@
+JuliaFEM
+========
+
+.. include:: ../readme.rst
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   readme
+   api/index
+