diff --git a/src/parser/nom_context.rs b/src/parser/nom_context.rs
index ced63e8..ca184aa 100644
--- a/src/parser/nom_context.rs
+++ b/src/parser/nom_context.rs
@@ -1,11 +1,6 @@
 use nom::branch::alt;
-use nom::combinator::recognize;
 use nom::error::VerboseError;
 use nom::IResult;
-use std::cell::RefCell;
-use std::rc::Rc;
-
-use super::text::bold_end;
 
 #[derive(Clone)]
 pub struct NomContext<F>
@@ -27,7 +22,7 @@ where
 {
     pub fn new(fail_matcher: F) -> Self {
         NomContext {
-            fail_matcher: fail_matcher,
+            fail_matcher,
             can_match_bold: true,
             can_match_link: true,
         }
diff --git a/src/parser/text.rs b/src/parser/text.rs
index 5bbe3a5..31c56cd 100644
--- a/src/parser/text.rs
+++ b/src/parser/text.rs
@@ -24,6 +24,7 @@ use nom::sequence::tuple;
 use nom::IResult;
 
 use super::nom_context::NomContext;
+use super::parser_with_context::parser_with_context;
 use super::text_element_parser::paragraph;
 
 pub type Res<T, U> = IResult<T, U, VerboseError<T>>;
@@ -139,5 +140,6 @@ pub fn paragraph_end(input: &str) -> Res<&str, &str> {
 }
 
 pub fn document(input: &str) -> Res<&str, Vec<(Vec<TextElement>, &str)>> {
-    many1(paragraph)(input)
+    let initial_context = NomContext::new(&paragraph_end);
+    many1(parser_with_context!(paragraph)(initial_context))(input)
 }
diff --git a/src/parser/text_element_parser.rs b/src/parser/text_element_parser.rs
index 59c67f9..abb6eea 100644
--- a/src/parser/text_element_parser.rs
+++ b/src/parser/text_element_parser.rs
@@ -74,8 +74,14 @@ where
     )(i)
 }
 
-pub fn paragraph(input: &str) -> Res<&str, (Vec<TextElement>, &str)> {
-    let initial_context = NomContext::new(&paragraph_end);
-    let text_element_parser = parser_with_context!(flat_text_element)(initial_context);
-    many_till(text_element_parser, paragraph_end)(input)
+pub fn paragraph<'a, F>(
+    i: &'a str,
+    context: &mut NomContext<F>,
+) -> Res<&'a str, (Vec<TextElement<'a>>, &'a str)>
+where
+    F: for<'b> FnMut(&'b str) -> IResult<&'b str, &'b str, VerboseError<&'b str>>,
+    F: Clone,
+{
+    let text_element_parser = parser_with_context!(flat_text_element)(context.clone());
+    many_till(text_element_parser, paragraph_end)(i)
 }