diff --git a/pyircbot/modules/LinkTitler.py b/pyircbot/modules/LinkTitler.py
index 0f51056..ebe449f 100755
--- a/pyircbot/modules/LinkTitler.py
+++ b/pyircbot/modules/LinkTitler.py
@@ -76,7 +76,7 @@ class LinkTitler(ModuleBase):
         # subreddits
 
         # generic <title>
-        matches = re.compile(r'(https?://([a-zA-Z0-9_\-\.]+/([A-Za-z0-9\-\._~:\/?#[]@!$&\'\(\)\*\+\,\;=]+)?))') \
+        matches = re.compile(r'(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*))') \
             .findall(trailing)
         if matches:
             done = []
@@ -103,8 +103,6 @@ class LinkTitler(ModuleBase):
                                           self.nicesize(int(headers["Content-Length"])) if
                                           "Content-Length" in headers else "unknown size"))
 
-            return
-
     def get_reddit_submission(self, subid):
         r = praw.Reddit(**self.config["reddit"])
         return r.submission(id=subid)