diff --git a/markdown.php b/markdown.php
index f7167d5..2e2f9d0 100644
--- a/markdown.php
+++ b/markdown.php
@@ -68,10 +68,10 @@ class markdown
     $search[] = "/^--+ (.+)( --+)?$/Um";
     $replace[] = "</p>\n<h2>\\1</h2>\n<p>";
     // EMPHASIS : _ or * for normal, __ or ** for strong
-    $search[] = "/__(.+)__/";              $replace[] = "<strong>\\1</strong>";
-    $search[] = "/_(.+)_/";                $replace[] = "<em>\\1</em>";
-    $search[] = "/\*\*(.+)\*\*/";          $replace[] = "<strong>\\1</strong>";
-    $search[] = "/\*(.+)\*/";              $replace[] = "<em>\\1</em>";
+    $search[] = "/__([^_]+)__/";     $replace[] = "<strong>\\1</strong>";
+    $search[] = "/_([^_]+)_/";       $replace[] = "<em>\\1</em>";
+    $search[] = "/\*\*([^*]+)\*\*/"; $replace[] = "<strong>\\1</strong>";
+    $search[] = "/\*([^*]+)\*/";     $replace[] = "<em>\\1</em>";
 
     // CODE : `code` -> <code>
     $search[] = "/\\n?\`((\\n|.)+)\`/Um";