diff --git a/src/main/scala/util/JGitUtil.scala b/src/main/scala/util/JGitUtil.scala
index 669330e..07ddc66 100644
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -49,10 +49,10 @@
    *
    * @param id the commit id
    * @param time the commit time
-   * @param committer  the commiter name
+   * @param committer  the committer name
    * @param shortMessage the short message
    * @param fullMessage the full message
-   * @param parents the list of parent commid id
+   * @param parents the list of parent commit id
    */
   case class CommitInfo(id: String, time: Date, committer: String, shortMessage: String, fullMessage: String, parents: List[String]){
     
@@ -60,16 +60,26 @@
         rev.getName, rev.getCommitterIdent.getWhen, rev.getCommitterIdent.getName, rev.getShortMessage, rev.getFullMessage,
         rev.getParents().map(_.name).toList)
 
-    val description = {
-      if(shortMessage == fullMessage){
-        None
+    val summary = {
+      val i = fullMessage.trim.indexOf("\n")
+      val firstLine = if(i >= 0){
+        fullMessage.trim.substring(0, i).trim
       } else {
-        val i = fullMessage.trim.indexOf("\n")
-        if(i >= 0){
-          Some(fullMessage.trim.substring(i).trim)
-        } else {
-          None
-        }
+        fullMessage
+      }
+      if(firstLine.length > shortMessage.length){
+        shortMessage
+      } else {
+        firstLine
+      }
+    }
+
+    val description = {
+      val i = fullMessage.trim.indexOf("\n")
+      if(i >= 0){
+        Some(fullMessage.trim.substring(i).trim)
+      } else {
+        None
       }
     }
 
diff --git a/src/main/scala/view/helpers.scala b/src/main/scala/view/helpers.scala
index 9af5c36..42e697c 100644
--- a/src/main/scala/view/helpers.scala
+++ b/src/main/scala/view/helpers.scala
@@ -36,7 +36,7 @@
       // convert issue id to link
       .replaceAll("(^|\\W)#([0-9]+)(\\W|$)", "$1<a href=\"%s/%s/%s/issues/$2\">#$2</a>$3".format(context.path, repository.owner, repository.name))
       // convert commit id to link
-      .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", "$1<a href=\"%s/%s/%s/commit/$0\">$2</a>$3").format(context.path, repository.owner, repository.name))
+      .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", "$1<a href=\"%s/%s/%s/commit/$2\">$2</a>$3").format(context.path, repository.owner, repository.name))
 
 }
 
diff --git a/src/main/twirl/repo/blob.scala.html b/src/main/twirl/repo/blob.scala.html
index 0d4a8cc..1d1c8ae 100644
--- a/src/main/twirl/repo/blob.scala.html
+++ b/src/main/twirl/repo/blob.scala.html
@@ -21,7 +21,7 @@
         <div class="pull-left">
           <a href="@path/@latestCommit.committer" class="username">@latestCommit.committer</a>
           <span class="description">@helpers.datetime(latestCommit.time)</span>
-          <a href="@path/@repository.owner/@repository.name/commit/@latestCommit.id" class="commit-message">@helpers.link(latestCommit.shortMessage, repository)</a>
+          <a href="@path/@repository.owner/@repository.name/commit/@latestCommit.id" class="commit-message">@helpers.link(latestCommit.summary, repository)</a>
         </div>
         <div class="btn-group pull-right">
           <a class="btn btn-mini" href="?raw=true">Raw</a>
diff --git a/src/main/twirl/repo/commit.scala.html b/src/main/twirl/repo/commit.scala.html
index 0d289b3..54dfa2a 100644
--- a/src/main/twirl/repo/commit.scala.html
+++ b/src/main/twirl/repo/commit.scala.html
@@ -12,7 +12,7 @@
         <div class="pull-right align-right">
           <a href="@path/@repository.owner/@repository.name/tree/@commit.id" class="btn btn-small">Browse code</a>
         </div>
-        <div class="commit-log">@helpers.link(commit.shortMessage, repository)</div>
+        <div class="commit-log">@helpers.link(commit.summary, repository)</div>
         @if(commit.description.isDefined){
           <pre class="commit-description">@helpers.link(commit.description.get, repository)</pre>
         }
diff --git a/src/main/twirl/repo/commits.scala.html b/src/main/twirl/repo/commits.scala.html
index 7828579..ec22d22 100644
--- a/src/main/twirl/repo/commits.scala.html
+++ b/src/main/twirl/repo/commits.scala.html
@@ -30,7 +30,7 @@
       <tr>
         <td>
           <div class="pull-left">
-            <a href="@path/@repository.owner/@repository.name/commit/@commit.id" class="commit-message" style="font-weight: bold;">@helpers.link(commit.shortMessage, repository)</a>
+            <a href="@path/@repository.owner/@repository.name/commit/@commit.id" class="commit-message" style="font-weight: bold;">@helpers.link(commit.summary, repository)</a>
             @if(commit.description.isDefined){
               <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
             }
diff --git a/src/main/twirl/repo/files.scala.html b/src/main/twirl/repo/files.scala.html
index 596917f..c3f7985 100644
--- a/src/main/twirl/repo/files.scala.html
+++ b/src/main/twirl/repo/files.scala.html
@@ -14,7 +14,7 @@
     <table class="table table-file-list" style="border: 1px solid silver;">
       <tr>
         <th colspan="4" style="font-weight: normal;">
-          <a href="@path/@repository.owner/@repository.name/commit/@latestCommit.id" class="commit-message">@helpers.link(latestCommit.shortMessage, repository)</a>
+          <a href="@path/@repository.owner/@repository.name/commit/@latestCommit.id" class="commit-message">@helpers.link(latestCommit.summary, repository)</a>
           @if(latestCommit.description.isDefined){
             <a href="javascript:void(0)" onclick="$('#description-@latestCommit.id').toggle();" class="omit">...</a>
           }