diff --git a/sundown b/sundown
index 2bb12820..0e7d0cc6 160000
--- a/sundown
+++ b/sundown
@@ -1 +1 @@
-Subproject commit 2bb12820b13f3a71342f5a911e1d1a7667105506
+Subproject commit 0e7d0cc653874fef49a3ef25c01bc2ccd726c9bf
diff --git a/test/redcarpet_test.rb b/test/redcarpet_test.rb
index e478d108..14af6490 100644
--- a/test/redcarpet_test.rb
+++ b/test/redcarpet_test.rb
@@ -336,6 +336,14 @@ def test_spaced_headers
     rd = render_with({:space_after_headers => true}, "#123 a header yes\n")
     assert rd !~ /<h1>/
   end
+
+  def test_proper_intra_emphasis
+    md = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :no_intra_emphasis => true)
+    assert render_with({:no_intra_emphasis => true}, "http://en.wikipedia.org/wiki/Dave_Allen_(comedian)") !~ /<em>/
+    assert render_with({:no_intra_emphasis => true}, "this fails: hello_world_") !~ /<em>/
+    assert render_with({:no_intra_emphasis => true}, "this also fails: hello_world_#bye") !~ /<em>/
+    assert render_with({:no_intra_emphasis => true}, "this works: hello_my_world") !~ /<em>/
+  end
 end
 
 class CustomRenderTest < Test::Unit::TestCase