diff --git a/lib/textile/lexer.ex b/lib/textile/lexer.ex
index e1fb7500..fc43d33b 100644
--- a/lib/textile/lexer.ex
+++ b/lib/textile/lexer.ex
@@ -132,7 +132,9 @@ defmodule Textile.Lexer do
       string("!"),
       string(","),
       string("_") |> concat(choice([space(), eos()])),
-      string("?") |> concat(choice([space(), eos()]))
+      string("?") |> concat(choice([space(), eos()])),
+      space(),
+      eos()
     ])
 
   link_contents_start =