diff --git a/dist/showdown.js b/dist/showdown.js
index bdd07a8..a82f633 100644
Binary files a/dist/showdown.js and b/dist/showdown.js differ
diff --git a/dist/showdown.js.map b/dist/showdown.js.map
index b9c2fd7..0b3c9f6 100644
Binary files a/dist/showdown.js.map and b/dist/showdown.js.map differ
diff --git a/dist/showdown.min.js b/dist/showdown.min.js
index ea2f7b5..a0ac136 100644
Binary files a/dist/showdown.min.js and b/dist/showdown.min.js differ
diff --git a/dist/showdown.min.js.map b/dist/showdown.min.js.map
index 3f1838a..13e1034 100644
Binary files a/dist/showdown.min.js.map and b/dist/showdown.min.js.map differ
diff --git a/src/subParsers/makehtml/italicsAndBold.js b/src/subParsers/makehtml/italicsAndBold.js
index b644075..07862be 100644
--- a/src/subParsers/makehtml/italicsAndBold.js
+++ b/src/subParsers/makehtml/italicsAndBold.js
@@ -13,10 +13,10 @@ showdown.subParser('makehtml.italicsAndBold', function (text, options, globals)
 
   // Parse underscores
   if (options.literalMidWordUnderscores) {
-    text = text.replace(/\b___(\S[\s\S]*)___\b/g, function (wm, txt) {
+    text = text.replace(/\b___(\S[\s\S]*?)___\b/g, function (wm, txt) {
       return parseInside (txt, '<strong><em>', '</em></strong>');
     });
-    text = text.replace(/\b__(\S[\s\S]*)__\b/g, function (wm, txt) {
+    text = text.replace(/\b__(\S[\s\S]*?)__\b/g, function (wm, txt) {
       return parseInside (txt, '<strong>', '</strong>');
     });
     text = text.replace(/\b_(\S[\s\S]*?)_\b/g, function (wm, txt) {
diff --git a/test/functional/makehtml/cases/features/literalMidWordUnderscores/basic.html b/test/functional/makehtml/cases/features/literalMidWordUnderscores/basic.html
index 8293687..7d7d9e9 100644
--- a/test/functional/makehtml/cases/features/literalMidWordUnderscores/basic.html
+++ b/test/functional/makehtml/cases/features/literalMidWordUnderscores/basic.html
@@ -7,3 +7,6 @@
 <p>strippers, <em>hitler</em>, and stalin</p>
 <p>strippers, <strong>hitler</strong>, and stalin</p>
 <p>strippers, <strong><em>hitler</em></strong>, and stalin</p>
+<p><strong><em>multiple</em></strong> italics and bolds in a <strong><em>paragraph</em></strong></p>
+<p><strong>multiple</strong> bolds in a <strong>paragraph</strong></p>
+<p><em>multiple</em> italics in a <em>paragraph</em></p>
\ No newline at end of file
diff --git a/test/functional/makehtml/cases/features/literalMidWordUnderscores/basic.md b/test/functional/makehtml/cases/features/literalMidWordUnderscores/basic.md
index e2be213..54a820e 100644
--- a/test/functional/makehtml/cases/features/literalMidWordUnderscores/basic.md
+++ b/test/functional/makehtml/cases/features/literalMidWordUnderscores/basic.md
@@ -15,3 +15,9 @@ strippers, _hitler_, and stalin
 strippers, __hitler__, and stalin
 
 strippers, ___hitler___, and stalin
+
+___multiple___ italics and bolds in a ___paragraph___
+
+__multiple__ bolds in a __paragraph__
+
+_multiple_ italics in a _paragraph_
\ No newline at end of file
diff --git a/test/functional/makehtml/cases/standard/emphasis.html b/test/functional/makehtml/cases/standard/emphasis.html
index 06cb4e4..805daf8 100644
--- a/test/functional/makehtml/cases/standard/emphasis.html
+++ b/test/functional/makehtml/cases/standard/emphasis.html
@@ -37,3 +37,9 @@
 <p>this is <strong><a href="//google.com">imbued link with strong</a></strong></p>
 <p>this is <strong><a href="//google.com">imbued link with strong</a></strong></p>
 <p>this link has underscore <a href="http://www.google.com/some_link">some_link</a></p>
+<p><strong><em>multiple</em></strong> italics and bolds with underscores in a <strong><em>paragraph</em></strong></p>
+<p><strong><em>multiple</em></strong> italics and bolds with asterisks in a <strong><em>paragraph</em></strong></p>
+<p><strong>multiple</strong> bolds with underscores in a <strong>paragraph</strong></p>
+<p><strong>multiple</strong> bolds with asterisks in a <strong>paragraph</strong></p>
+<p><em>multiple</em> italics with underscores in a <em>paragraph</em></p>
+<p><em>multiple</em> italics with asterisks in a <em>paragraph</em></p>
diff --git a/test/functional/makehtml/cases/standard/emphasis.md b/test/functional/makehtml/cases/standard/emphasis.md
index 967a074..1177fde 100644
--- a/test/functional/makehtml/cases/standard/emphasis.md
+++ b/test/functional/makehtml/cases/standard/emphasis.md
@@ -74,3 +74,15 @@ this is **<a href="//google.com">imbued link with strong</a>**
 this is __<a href="//google.com">imbued link with strong</a>__
 
 this link has underscore [some_link](http://www.google.com/some_link)
+
+___multiple___ italics and bolds with underscores in a ___paragraph___
+
+***multiple*** italics and bolds with asterisks in a ***paragraph***
+
+__multiple__ bolds with underscores in a __paragraph__
+
+**multiple** bolds with asterisks in a **paragraph**
+
+_multiple_ italics with underscores in a _paragraph_
+
+_multiple_ italics with asterisks in a _paragraph_