diff --git a/tablefield.module b/tablefield.module
index 67d79c4..95ed62d 100644
--- a/tablefield.module
+++ b/tablefield.module
@@ -389,7 +389,7 @@ function tablefield_field_formatter_view($entity_type, $entity, $field, $instanc
         foreach ($tabledata as $row_key => $row) {
           foreach ($row as $col_key => $cell) {
             if (!empty($table['format'])) {
-              $tabledata[$row_key][$col_key] = array('data' => check_markup($cell, $table['format']), 'class' => array('row_' . $row_key, 'col_' . $col_key));
+              $tabledata[$row_key][$col_key] = array('data' => generate_proper_link($cell), 'class' => array('row_' . $row_key, 'col_' . $col_key));
             }
             else {
               $tabledata[$row_key][$col_key] = array('data' => check_plain($cell), 'class' => array('row_' . $row_key, 'col_' . $col_key));
@@ -992,3 +992,30 @@ function tablefield_transpose($array) {
   }
   return $transposed;
 }
+
+// Function to create the proper link.
+function generate_proper_link($input = "") {
+
+  $link = "";
+  // Match the url in the input.
+  $url_pattern = "/((http|https)\:\/\/)?[a-zA-Z0-9\.\/\?\:@\-_=#+]+\.([a-zA-Z0-9\&\.\/\?\:@\-_=#+])*/";
+  // Match innersite paths
+  $inner_path = "/^(\\/[^\\s]+)/";
+
+  if (preg_match($url_pattern, $input, $m) || preg_match($inner_path, $input, $m)) {
+    $link = $m[0];
+    $input = str_replace($link . " ", "", $input);
+    
+    $input = trim($input);
+    // If there is no link name - the plain url will be displayed
+    if (empty($input)) {
+      $input = $link;
+    }
+    // Add http:// to the url, because otherwise it will redirect to the /www.example.com.
+    if (strpos($link, "http") === FALSE && $link[0] != "/") {
+      $link = "http://" . $link;
+    }
+    return l(t($input), $link);
+  }
+  return $input;
+}
