diff --git a/lib/textile/lexer.ex b/lib/textile/lexer.ex
index f55f8f41..61792c13 100644
--- a/lib/textile/lexer.ex
+++ b/lib/textile/lexer.ex
@@ -127,16 +127,12 @@ defmodule Textile.Lexer do
       string("*"),
       string("_"),
       string("@"),
-      string("+"),
       string("^"),
-      string("-"),
       string("~"),
       string("."),
-      string("?"),
       string("!"),
       string(","),
-      space(),
-      eos()
+      string("?") |> concat(choice([space(), eos()]))
     ])
 
   link_contents_start =