diff --git a/angular-linkify.js b/angular-linkify.js
index a00f413..ef03139 100644
--- a/angular-linkify.js
+++ b/angular-linkify.js
@@ -9,7 +9,7 @@ angular.module('linkify')
           return;
         }
 
-        var _text = _str.replace( /(?:https?\:\/\/|www\.)+(?![^\s]*?")([\w.,@?!^=%&:\/~+#-]*[\w@?!^=%&\/~+#-])?/ig, function(url) {
+        var _text = _str.replace( /(?:https?:\/\/|www.)([-A-Za-z0-9+&@#/%?=~_()|!:,.;]*[-A-Za-z0-9+&@#/%=~_()|])/ig, function(url) {
           var wrap = document.createElement('div');
           var anch = document.createElement('a');
           anch.href = url;