diff --git a/src/main/scala/util/JGitUtil.scala b/src/main/scala/util/JGitUtil.scala
index c6148b4..2ae7bb4 100644
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -6,9 +6,9 @@
 import javax.servlet.ServletContext
 import org.eclipse.jgit.lib._
 import org.eclipse.jgit.revwalk._
-import org.eclipse.jgit.revwalk.filter.RevFilter
+import org.eclipse.jgit.revwalk.filter._
 import org.eclipse.jgit.treewalk._
-import org.eclipse.jgit.treewalk.filter.PathFilter
+import org.eclipse.jgit.treewalk.filter._
 import org.eclipse.jgit.diff._
 import org.eclipse.jgit.diff.DiffEntry.ChangeType
 import org.eclipse.jgit.util.io.DisabledOutputStream
@@ -144,9 +144,27 @@
     treeWalk.addTree(revCommit.getTree)
     if(path != "."){
       treeWalk.setRecursive(true)
-      treeWalk.setFilter(PathFilter.create(path))
-      treeWalk.next()
-      treeWalk.setRecursive(false)
+      treeWalk.setFilter(new TreeFilter(){
+
+        var stopRecursive = false
+
+        def include(walker: TreeWalk): Boolean = {
+          val targetPath = walker.getPathString
+          if((path + "/").startsWith(targetPath)){
+            true
+          } else if(targetPath.startsWith(path + "/") && targetPath.substring(path.length + 1).indexOf("/") < 0){
+            stopRecursive = true
+            treeWalk.setRecursive(false)
+            true
+          } else {
+            false
+          }
+        }
+
+        def shouldBeRecursive(): Boolean = !stopRecursive
+
+        override def clone: TreeFilter = return this
+      })
     }
       
     val list = new scala.collection.mutable.ListBuffer[FileInfo]
diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html
index f080e8b..57c57d2 100644
--- a/src/main/twirl/repo/blob.scala.html
+++ b/src/main/twirl/repo/blob.scala.html
@@ -6,11 +6,11 @@
   @navtab(branch, repository, "files")
   <div class="head">
     <a href="@path/@repository.owner/@repository.name/tree/@branch">@repository.name</a> /
-    @pathList.zipWithIndex.map { case (path, i) =>
+    @pathList.zipWithIndex.map { case (section, i) =>
       @if(i == pathList.length - 1){
-        @path
+        @section
       } else {
-        <a href="@path/@repository.owner/@repository.name/tree/@branch/@pathList.take(i + 1).mkString("/")">@path</a> /
+        <a href="@path/@repository.owner/@repository.name/tree/@branch/@pathList.take(i + 1).mkString("/")">@section</a> /
       }
     }
   </div>