diff --git a/string.php b/string.php
index 7b50b53..4b5c8c3 100644
--- a/string.php
+++ b/string.php
@@ -258,8 +258,8 @@ function onlySimpleHTML($s) {
   return $s;
 }
 function linkify($input) {
-  $pattern = '@(http(s)?://)?(([a-zA-Z])([-\w]+\.)+([^\s\.]+[^\s]*)+[^,.\s])@';
-  return $output = preg_replace ( $pattern, '<a href="http$2://$3">$0</a>', $input );
+  $pattern = '@(http(s)?://[a-zA-Z0-9/\.\#\-\_]*)@';
+  return $output = preg_replace ( $pattern, '<a href="$1">$1</a>', $input );
 }
 function inStr($needle, $haystack) {
   if (strpos ( $haystack, $needle ) !== false) {