diff --git a/Better Markdown/GithubFlavoredMarkdown.tmLanguage b/Better Markdown/GithubFlavoredMarkdown.tmLanguage
index 6f3586c..03f684e 100644
--- a/Better Markdown/GithubFlavoredMarkdown.tmLanguage
+++ b/Better Markdown/GithubFlavoredMarkdown.tmLanguage
@@ -573,6 +573,14 @@
include
#link-email
+
+ include
+ #autolink
+
+
+ include
+ #autolink-email
+
include
#image-ref
@@ -704,6 +712,14 @@
include
#link-email
+
+ include
+ #autolink
+
+
+ include
+ #autolink-email
+
include
#image-ref
@@ -958,6 +974,14 @@
include
#link-email
+
+ include
+ #autolink
+
+
+ include
+ #autolink-email
+
include
#image-ref
@@ -1090,6 +1114,14 @@
include
#link-email
+
+ include
+ #autolink
+
+
+ include
+ #autolink-email
+
include
#image-ref
@@ -1161,6 +1193,29 @@
name
meta.link.inet.markdown.github
+ autolink
+
+ match
+ (?x)(?i)
+ (
+ (
+ (ht|f)tp(s?)://(([a-zA-Z0-9\-._]+(\.[a-zA-Z0-9\-._]+)+)|localhost)|
+ (w{3})(\.[a-zA-Z0-9\-._]+(\.[a-zA-Z0-9\-._]+)+)
+ )
+ (/?)([a-zA-Z0-9\-.?,'/+&%$\#_]*)([\d\w./%+-=&?:"',|~;]*)
+ [A-Za-z\d\-_~:/?\#@!$*+=]
+ )
+
+ name
+ markup.underline.link.markdown.github
+
+ autolink-email
+
+ match
+ (?i)((?:[\-+\w]([\w\-+]|\.(?!\.))+)@(?:[\w\-]+\.)(([\w\-]|(?<!\.)\.(?!\.))*)[a-z](?![\d.\-+_]))
+ name
+ markup.underline.link.email.markdown.github
+
link-inline
captures