diff --git a/src/Plugins/GithubCommit/Configurator.php b/src/Plugins/GithubCommit/Configurator.php
index d681dff..ac9cb8a 100644
--- a/src/Plugins/GithubCommit/Configurator.php
+++ b/src/Plugins/GithubCommit/Configurator.php
@@ -16,7 +16,7 @@
 
 class Configurator extends Github
 {
-    protected $regexp = '/(?:^|\b)(?:https?\:\/\/github\.com\/([\w.-]+\/[\w.-]+)\/commit\/([0-9a-f]{7,40})(#commitcomment-\w+)?(#diff-[\w.-]+)?|([\w-]+\/[\w.-]+)@([0-9a-f]{7,40}))/si';
+    protected $regexp = '/(?:^|\b)(?:https?\:\/\/github\.com\/([\w-]+\/[\w-]+)\/commit\/([0-9a-f]{7,40})(#commitcomment-\w+)?(#diff-[\w-]+)?|([\w-]+\/[\w-]+)@([0-9a-f]{7,40}))/si';
 
     protected $tagName = 'GITHUBCOMMIT';
 
diff --git a/src/Plugins/GithubCompare/Configurator.php b/src/Plugins/GithubCompare/Configurator.php
index 792c52a..3628dd6 100644
--- a/src/Plugins/GithubCompare/Configurator.php
+++ b/src/Plugins/GithubCompare/Configurator.php
@@ -16,7 +16,7 @@
 
 class Configurator extends Github
 {
-    protected $regexp = '/(?:^|\b)(?:https?\:\/\/github\.com\/([\w.-]+\/[\w.-]+)\/compare\/([\w\-\.]+)\.\.\.([\w\-\.]+))/si';
+    protected $regexp = '/(?:^|\b)(?:https?\:\/\/github\.com\/([\w-]+\/[\w-]+)\/compare\/([\w\-\.]+)\.\.\.([\w\-\.]+))/si';
 
     protected $tagName = 'GITHUBCOMPARE';
 
diff --git a/src/Plugins/GithubIssue/Configurator.php b/src/Plugins/GithubIssue/Configurator.php
index 96efabf..334238a 100644
--- a/src/Plugins/GithubIssue/Configurator.php
+++ b/src/Plugins/GithubIssue/Configurator.php
@@ -16,7 +16,7 @@
 
 class Configurator extends Github
 {
-    protected $regexp = '/(?:^|\b)(?:https?\:\/\/github\.com\/([\w.-]+\/[\w.-]+)\/(issues)\/(\d+)(#issuecomment-\d+)?|([\w.-]+\/[\w.-]+)#(\d+))/si';
+    protected $regexp = '/(?:^|\b)(?:https?\:\/\/github\.com\/([\w-]+\/[\w-]+)\/(issues)\/(\d+)(#issuecomment-\d+)?|([\w-]+\/[\w-]+)#(\d+))/si';
     protected $tagName = 'GITHUBISSUE';
 
     protected function getClassName()
diff --git a/src/Plugins/GithubPullRequest/Configurator.php b/src/Plugins/GithubPullRequest/Configurator.php
index 027d9aa..81c8d39 100644
--- a/src/Plugins/GithubPullRequest/Configurator.php
+++ b/src/Plugins/GithubPullRequest/Configurator.php
@@ -16,7 +16,7 @@
 
 class Configurator extends Github
 {
-    protected $regexp = '/(?:^|\b)(?:https?\:\/\/github\.com\/([\w.-]+\/[\w.-]+)\/pull\/(\d+)(#pullrequestreview-\d+)?(\/commits\/[0-9a-f]{7,40})?)/si';
+    protected $regexp = '/(?:^|\b)(?:https?\:\/\/github\.com\/([\w-]+\/[\w-]+)\/pull\/(\d+)(#pullrequestreview-\d+)?(\/commits\/[0-9a-f]{7,40})?)/si';
     protected $tagName = 'GITHUBPR';
 
     protected function getClassName()
diff --git a/src/Plugins/GithubRepository/Configurator.php b/src/Plugins/GithubRepository/Configurator.php
index 12ff560..7a0acd7 100644
--- a/src/Plugins/GithubRepository/Configurator.php
+++ b/src/Plugins/GithubRepository/Configurator.php
@@ -16,7 +16,7 @@
 
 class Configurator extends Github
 {
-    protected $regexp = '/(?:^|\b)(?:https?\:\/\/github\.com\/([\w.-]+\/[\w.-]+)(\/[^\s]*)?)/si';
+    protected $regexp = '/(?:^|\b)(?:https?\:\/\/github\.com\/([\w-]+\/[\w-]+)(\/[^\s]*)?)/si';
     protected $tagName = 'GITHUBREPO';
 
     protected function getClassName()