diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala
index 1f8453c..5a3317d 100644
--- a/src/main/scala/app/PullRequestsController.scala
+++ b/src/main/scala/app/PullRequestsController.scala
@@ -183,6 +183,18 @@
               }
             }
 
+            // close issue by content of pull request
+            val defaultBranch = getRepository(owner, name, baseUrl).get.repository.defaultBranch
+            if(pullreq.branch == defaultBranch){
+              commits.flatten.foreach { commit =>
+                closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
+              }
+              issue.content match {
+                case Some(content) => closeIssuesFromMessage(content, loginAccount.userName, owner, name)
+                case _ =>
+              }
+              closeIssuesFromMessage(form.message, loginAccount.userName, owner, name)
+            }
             // call web hook
             getWebHookURLs(owner, name) match {
               case webHookURLs if(webHookURLs.nonEmpty) =>
diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala
index 54edaf3..81a9bf8 100644
--- a/src/main/scala/service/IssuesService.scala
+++ b/src/main/scala/service/IssuesService.scala
@@ -314,6 +314,18 @@
     }.toList
   }
 
+  def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String) = {
+    val regex = "(?i)(?<!\\w)(?:fix(?:e[sd])?|resolve[sd]?|close[sd]?)\\s+#(\\d+)(?!\\w)".r
+    regex.findAllIn(message).matchData.map(_.group(1)).foreach { issueId =>
+      getIssue(owner, repository, issueId) match {
+        case Some(issue) if !issue.closed => {
+          createComment(owner, repository, userName, issue.issueId, "Close", "close")
+          updateClosed(owner, repository, issue.issueId, true)
+        }
+        case _ =>
+      }
+    }
+  }
 }
 
 object IssuesService {
diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala
index 2c521c8..e1a00d7 100644
--- a/src/main/scala/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/servlet/GitRepositoryServlet.scala
@@ -141,6 +141,14 @@
             }
           }
 
+          // close issues
+          val defaultBranch = getRepository(owner, repository, baseURL).get.repository.defaultBranch
+          if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){
+            git.log.addRange(command.getOldId, command.getNewId).call.asScala.foreach { commit =>
+              closeIssuesFromMessage(commit.getFullMessage, pusher, owner, repository)
+            }
+          }
+
           // call web hook
           getWebHookURLs(owner, repository) match {
             case webHookURLs if(webHookURLs.nonEmpty) =>