diff --git a/.idea/markdown-navigator-enh.xml b/.idea/markdown-navigator-enh.xml
index 4eb2419ad..28ca4b75b 100644
--- a/.idea/markdown-navigator-enh.xml
+++ b/.idea/markdown-navigator-enh.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="MarkdownEnhProjectSettings">
+    <EnhHtmlSettings embedUrlContent="false" embedImages="false" embedHttpImages="false" migratedMathConversion="true" mathConversion="-1" />
     <AnnotatorSettings targetHasSpaces="true" linkCaseMismatch="true" wikiCaseMismatch="true" wikiLinkHasDashes="true" notUnderWikiHome="true" targetNotWikiPageExt="true" notUnderSourceWikiHome="true" targetNameHasAnchor="true" targetPathHasAnchor="true" wikiLinkHasSlash="true" wikiLinkHasSubdir="true" wikiLinkHasOnlyAnchor="true" linkTargetsWikiHasExt="true" linkTargetsWikiHasBadExt="true" notUnderSameRepo="true" targetNotUnderVcs="false" linkNeedsExt="true" linkHasBadExt="true" linkTargetNeedsExt="true" linkTargetHasBadExt="true" wikiLinkNotInWiki="true" imageTargetNotInRaw="true" repoRelativeAcrossVcsRoots="true" multipleWikiTargetsMatch="true" unresolvedLinkReference="true" linkIsIgnored="true" anchorIsIgnored="true" anchorIsUnresolved="true" anchorLineReferenceIsUnresolved="true" anchorLineReferenceFormat="true" anchorHasDuplicates="true" abbreviationDuplicates="true" abbreviationNotUsed="true" attributeIdDuplicateDefinition="true" attributeIdNotUsed="true" footnoteDuplicateDefinition="true" footnoteUnresolved="true" footnoteDuplicates="true" footnoteNotUsed="true" macroDuplicateDefinition="true" macroUnresolved="true" macroDuplicates="true" macroNotUsed="true" referenceDuplicateDefinition="true" referenceUnresolved="true" referenceDuplicates="true" referenceNotUsed="true" referenceUnresolvedNumericId="true" enumRefDuplicateDefinition="true" enumRefUnresolved="true" enumRefDuplicates="true" enumRefNotUsed="true" enumRefLinkUnresolved="true" enumRefLinkDuplicates="true" simTocUpdateNeeded="true" simTocTitleSpaceNeeded="true" />
     <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="css" scriptDir="js" plainHtml="false" imageDir="" copyLinkedImages="false" imagePathType="0" targetPathType="2" targetExt="" useTargetExt="false" noCssNoScripts="false" useElementStyleAttribute="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
     <LinkMapSettings>
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
index 9c271dfff..5016974eb 100644
--- a/.idea/markdown-navigator.xml
+++ b/.idea/markdown-navigator.xml
@@ -38,7 +38,7 @@
         <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
       </ParserOptions>
     </ParserSettings>
-    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="true" imageUriSerials="true" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0">
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="true" imageUriSerials="true" addDocTypeHtml="true" noParaTags="false" migratedPlantUml="false" plantUmlConversion="0">
       <GeneratorProvider>
         <provider providerId="com.vladsch.md.nav.editor.javafx.html.generator" providerName="JavaFx HTML Generator" />
       </GeneratorProvider>
@@ -46,6 +46,10 @@
       <headerBottom />
       <bodyTop />
       <bodyBottom />
+      <fencedCodeConversions>
+        <option name="latex" value="KATEX" />
+        <option name="math" value="KATEX" />
+      </fencedCodeConversions>
     </HtmlSettings>
     <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="true" isDynamicPageWidth="true">
       <StylesheetProvider>
diff --git a/.idea/markdown-navigator/COPY_HTML_MIME.xml b/.idea/markdown-navigator/COPY_HTML_MIME.xml
index 4359ad01c..62483936a 100644
--- a/.idea/markdown-navigator/COPY_HTML_MIME.xml
+++ b/.idea/markdown-navigator/COPY_HTML_MIME.xml
@@ -46,7 +46,7 @@
           <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
         </ParserOptions>
       </ParserSettings>
-      <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0">
+      <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false" migratedPlantUml="false" plantUmlConversion="0">
         <GeneratorProvider>
           <provider providerId="com.vladsch.md.nav.editor.javafx.html.generator" providerName="JavaFx HTML Generator" />
         </GeneratorProvider>
@@ -54,6 +54,10 @@
         <headerBottom />
         <bodyTop />
         <bodyBottom />
+        <fencedCodeConversions>
+          <option name="latex" value="KATEX" />
+          <option name="math" value="KATEX" />
+        </fencedCodeConversions>
       </HtmlSettings>
       <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="true" isDynamicPageWidth="true">
         <StylesheetProvider>
@@ -87,7 +91,7 @@
         </textMaps>
       </LinkMapSettings>
       <EnhPreviewSettings allowBrowsingInPreview="false" openRemoteLinks="true" replaceUnicodeEmoji="false" showGitHubPageIfSynced="false" />
-      <EnhHtmlSettings embedUrlContent="false" embedImages="false" embedHttpImages="false" mathConversion="-1" />
+      <EnhHtmlSettings embedUrlContent="false" embedImages="false" embedHttpImages="false" migratedMathConversion="true" mathConversion="-1" />
       <FlexmarkHtmlSettings flexmarkSpecExampleRendering="0" flexmarkSpecExampleRenderHtml="false">
         <flexmarkSectionLanguages>
           <option name="1" value="Markdown" />
diff --git a/.idea/markdown-navigator/Comms.xml b/.idea/markdown-navigator/Comms.xml
index 6e36078c6..94ddf4bfc 100644
--- a/.idea/markdown-navigator/Comms.xml
+++ b/.idea/markdown-navigator/Comms.xml
@@ -47,7 +47,7 @@
           <option name="SPACE_IN_LINK_URLS" value="true" />
         </ParserOptions>
       </ParserSettings>
-      <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="true" imageUriSerials="true" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0">
+      <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="true" imageUriSerials="true" addDocTypeHtml="true" noParaTags="false" migratedPlantUml="true" plantUmlConversion="0">
         <GeneratorProvider>
           <provider providerId="com.vladsch.md.nav.editor.javafx.html.generator" providerName="JavaFx HTML Generator" />
         </GeneratorProvider>
@@ -55,6 +55,12 @@
         <headerBottom />
         <bodyTop />
         <bodyBottom />
+        <fencedCodeConversions>
+          <option name="latex" value="KATEX" />
+          <option name="math" value="KATEX" />
+          <option name="plantuml" value="EMBEDDED" />
+          <option name="puml" value="EMBEDDED" />
+        </fencedCodeConversions>
       </HtmlSettings>
       <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="true" isDynamicPageWidth="true">
         <StylesheetProvider>
@@ -103,7 +109,7 @@ code {
         <textMaps />
       </LinkMapSettings>
       <EnhPreviewSettings allowBrowsingInPreview="false" openRemoteLinks="true" replaceUnicodeEmoji="false" showGitHubPageIfSynced="false" />
-      <EnhHtmlSettings embedUrlContent="false" embedImages="false" embedHttpImages="false" mathConversion="-1" />
+      <EnhHtmlSettings embedUrlContent="false" embedImages="false" embedHttpImages="false" migratedMathConversion="true" mathConversion="-1" />
       <FlexmarkHtmlSettings flexmarkSpecExampleRendering="0" flexmarkSpecExampleRenderHtml="false">
         <flexmarkSectionLanguages>
           <option name="1" value="Markdown" />
diff --git a/.idea/markdown-navigator/GitHub_Templates.xml b/.idea/markdown-navigator/GitHub_Templates.xml
index 30e0a7f44..43f88fe5b 100644
--- a/.idea/markdown-navigator/GitHub_Templates.xml
+++ b/.idea/markdown-navigator/GitHub_Templates.xml
@@ -25,7 +25,7 @@
           <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
         </ParserOptions>
       </ParserSettings>
-      <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="true" imageUriSerials="true" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0">
+      <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="true" imageUriSerials="true" addDocTypeHtml="true" noParaTags="false" migratedPlantUml="false" plantUmlConversion="0">
         <GeneratorProvider>
           <provider providerId="com.vladsch.md.nav.editor.javafx.html.generator" providerName="JavaFx HTML Generator" />
         </GeneratorProvider>
@@ -33,6 +33,10 @@
         <headerBottom />
         <bodyTop />
         <bodyBottom />
+        <fencedCodeConversions>
+          <option name="latex" value="KATEX" />
+          <option name="math" value="KATEX" />
+        </fencedCodeConversions>
       </HtmlSettings>
       <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="true" isDynamicPageWidth="true">
         <StylesheetProvider>
@@ -78,7 +82,7 @@ code {
         <textMaps />
       </LinkMapSettings>
       <EnhPreviewSettings allowBrowsingInPreview="false" openRemoteLinks="true" replaceUnicodeEmoji="false" showGitHubPageIfSynced="false" />
-      <EnhHtmlSettings embedUrlContent="false" embedImages="false" embedHttpImages="false" mathConversion="-1" />
+      <EnhHtmlSettings embedUrlContent="false" embedImages="false" embedHttpImages="false" migratedMathConversion="true" mathConversion="-1" />
       <FlexmarkHtmlSettings flexmarkSpecExampleRendering="0" flexmarkSpecExampleRenderHtml="false">
         <flexmarkSectionLanguages>
           <option name="1" value="Markdown" />
diff --git a/.idea/markdown-navigator/OVERVIEW.xml b/.idea/markdown-navigator/OVERVIEW.xml
index dc2e4a8e4..6fa70504a 100644
--- a/.idea/markdown-navigator/OVERVIEW.xml
+++ b/.idea/markdown-navigator/OVERVIEW.xml
@@ -42,7 +42,7 @@
           <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
         </ParserOptions>
       </ParserSettings>
-      <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="false" imageUriSerials="false" addDocTypeHtml="false" noParaTags="false" plantUmlConversion="0">
+      <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="false" imageUriSerials="false" addDocTypeHtml="false" noParaTags="false" migratedPlantUml="false" plantUmlConversion="0">
         <GeneratorProvider>
           <provider providerId="com.vladsch.md.nav.editor.javafx.html.generator" providerName="JavaFx HTML Generator" />
         </GeneratorProvider>
@@ -50,6 +50,10 @@
         <headerBottom />
         <bodyTop />
         <bodyBottom />
+        <fencedCodeConversions>
+          <option name="latex" value="KATEX" />
+          <option name="math" value="KATEX" />
+        </fencedCodeConversions>
       </HtmlSettings>
       <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="true" isDynamicPageWidth="true">
         <StylesheetProvider>
@@ -93,7 +97,7 @@ code {
         <textMaps />
       </LinkMapSettings>
       <EnhPreviewSettings allowBrowsingInPreview="false" openRemoteLinks="true" replaceUnicodeEmoji="false" showGitHubPageIfSynced="false" />
-      <EnhHtmlSettings embedUrlContent="false" embedImages="false" embedHttpImages="false" mathConversion="-1" />
+      <EnhHtmlSettings embedUrlContent="false" embedImages="false" embedHttpImages="false" migratedMathConversion="true" mathConversion="-1" />
       <FlexmarkHtmlSettings flexmarkSpecExampleRendering="0" flexmarkSpecExampleRenderHtml="false">
         <flexmarkSectionLanguages>
           <option name="1" value="Markdown" />
diff --git a/.idea/markdown-navigator/Wiki.xml b/.idea/markdown-navigator/Wiki.xml
index 5c8915161..503e20f64 100644
--- a/.idea/markdown-navigator/Wiki.xml
+++ b/.idea/markdown-navigator/Wiki.xml
@@ -28,7 +28,7 @@
           <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
         </ParserOptions>
       </ParserSettings>
-      <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="true" imageUriSerials="true" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0">
+      <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" addPageHeader="true" imageUriSerials="true" addDocTypeHtml="true" noParaTags="false" migratedPlantUml="false" plantUmlConversion="0">
         <GeneratorProvider>
           <provider providerId="com.vladsch.md.nav.editor.javafx.html.generator" providerName="JavaFx HTML Generator" />
         </GeneratorProvider>
@@ -36,6 +36,10 @@
         <headerBottom />
         <bodyTop />
         <bodyBottom />
+        <fencedCodeConversions>
+          <option name="latex" value="KATEX" />
+          <option name="math" value="KATEX" />
+        </fencedCodeConversions>
       </HtmlSettings>
       <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="true" isDynamicPageWidth="true">
         <StylesheetProvider>
@@ -83,7 +87,7 @@ code {
         <textMaps />
       </LinkMapSettings>
       <EnhPreviewSettings allowBrowsingInPreview="false" openRemoteLinks="true" replaceUnicodeEmoji="false" showGitHubPageIfSynced="false" />
-      <EnhHtmlSettings embedUrlContent="false" embedImages="false" embedHttpImages="false" mathConversion="-1" />
+      <EnhHtmlSettings embedUrlContent="false" embedImages="false" embedHttpImages="false" migratedMathConversion="true" mathConversion="-1" />
       <FlexmarkHtmlSettings flexmarkSpecExampleRendering="1" flexmarkSpecExampleRenderHtml="true">
         <flexmarkSectionLanguages>
           <option name="1" value="Markdown" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 51f0d89ef..75deba484 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -74,7 +74,7 @@
     <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
     <option name="myNullables">
       <value>
-        <list size="11">
+        <list size="12">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
@@ -86,12 +86,13 @@
           <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
           <item index="9" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
           <item index="10" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="11">
+        <list size="12">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="javax.validation.constraints.NotNull" />
@@ -103,6 +104,7 @@
           <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
           <item index="9" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
           <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
         </list>
       </value>
     </option>
@@ -117,4 +119,12 @@
       </set>
     </option>
   </component>
+  <component name="idea.plugin.psiviewer.controller.project.PsiViewerProjectService">
+    <option name="HIGHLIGHT" value="false" />
+    <option name="FILTER_WHITESPACE" value="false" />
+    <option name="SHOW_PROPERTIES" value="true" />
+    <option name="SPLIT_DIVIDER_POSITION" value="300" />
+    <option name="AUTOSCROLL_TO_SOURCE" value="false" />
+    <option name="AUTOSCROLL_FROM_SOURCE" value="false" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/VERSION-TODO.md b/VERSION-TODO.md
index 9570cbf83..bf0db9472 100644
--- a/VERSION-TODO.md
+++ b/VERSION-TODO.md
@@ -7,6 +7,7 @@
 - [Release 0.60.0](#release-0600)
   - [API Refactoring](#api-refactoring)
 - [Next 0.61.xx](#next-061xx)
+- [0.61.2](#0612)
 - [0.61.0](#0610)
 - [0.60.2](#0602)
 - [0.60.0](#0600)
@@ -214,6 +215,12 @@ Please give feedback on the upcoming changes if you have concerns about breaking
       `|` for each line that was wrapped. Otherwise, it is impossible to tell where each line
       ends and another begins.
 
+## 0.61.2
+
+* Fix: `ScopedDataSet.getAll()` and `ScopedDataSet.getKeys()` would not return keys from parent
+  scope.
+* Fix: [#396, DocumentParser stops reading too early resulting in the document being cut off] 
+
 ## 0.61.0
 
 * Fix: enable original spec tests
@@ -2311,4 +2318,6 @@ Please give feedback on the upcoming changes if you have concerns about breaking
 [migrate flexmark-java 0_40_x to 0_42_0]: https://github.com/vsch/flexmark-java/blob/master/assets/migrations/migrate%20flexmark-java%200_40_x%20to%200_42_0.xml
 <!-- @IGNORE PREVIOUS: link -->
 [migrate flexmark-java 0_42_x to 0_50_0.xml]: https://github.com/vsch/flexmark-java/blob/master/assets/migrations/migrate%20flexmark-java%200_42_x%20to%200_50_0.xml
+[#396, DocumentParser stops reading too early resulting in the document being cut off]: https://github.com/vsch/flexmark-java/issues/396
+
 
diff --git a/VERSION.md b/VERSION.md
index be2f425e5..e7bd1fdc0 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -6,6 +6,8 @@
 
 - [Release 0.60.0](#release-0600)
   - [API Refactoring](#api-refactoring)
+- [0.61.2](#0612)
+- [0.61.0](#0610)
 - [0.60.2](#0602)
 - [0.60.0](#0600)
 - [0.59.84](#05984)
@@ -155,6 +157,35 @@ Please give feedback on the upcoming changes if you have concerns about breaking
     * `com.vladsch.flexmark.util.ast.NodeAdaptingVisitHandler`
     * `com.vladsch.flexmark.util.ast.NodeAdaptingVisitor`
 
+## 0.61.2
+
+* Fix: `ScopedDataSet.getAll()` and `ScopedDataSet.getKeys()` would not return keys from parent
+  scope.
+* Fix: [#396, DocumentParser stops reading too early resulting in the document being cut off] 
+
+## 0.61.0
+
+* Fix: enable original spec tests
+* Fix: merge [#391, PR: Fix: CRLF line separator in fenced code blocks produce redundant CR.]
+* Fix: merge [#387, JUnit is in the compile scope]
+* Add: ability to insert anchor ref targets to `HtmlIdGenerator` when scanning a document.
+* Add: add `LinkResolverBasicContext` as base interface of `LinkResolverContext` to allow simple
+  context to pass to `LinkResolver` when resolving links without needing to implement all unused
+  methods of `LinkResolverContext`.
+* Break: change argument to `LinkResolver` and `LinkResolverFactory` to
+  `LinkResolverBasicContext`. Except for `JekyllTagExtension`, the argument is still
+  `LinkResolverContext` and passed value can be cast to this if required.
+* Add: support for `JekyllTagBlock` with `include` directive to `DocxRenderer`
+
+  Use `{% include includeFile %}` to include the file into the source document. `includeFile` is
+  resolved relative to `DocxRenderer.DOC_RELATIVE_URL` or `DocxRenderer.DOC_ROOT_URL`. The
+  latter is used if `includeFile` starts with `/`
+
+  Will only include files if `JekyllTagExtension.LINK_RESOLVER_FACTORIES` is not empty, in which
+  case the link resolvers will be used to resolve `includeFile` to full file path. Use singleton
+  list of `DocxLinkResolver.Factory` instance to resolve using doc relative and root url paths.
+* Fix: `MergeLinkResolver` and `DocxLinkResolver`
+
 ## 0.60.2
 
 * Fix: change formatter sub-context rendering node to nullable
@@ -1875,3 +1906,7 @@ Please give feedback on the upcoming changes if you have concerns about breaking
 [migrate flexmark-java 0_40_x to 0_42_0]: https://github.com/vsch/flexmark-java/blob/master/assets/migrations/migrate%20flexmark-java%200_40_x%20to%200_42_0.xml
 [migrate flexmark-java 0_42_x to 0_50_0.xml]: https://github.com/vsch/flexmark-java/blob/master/assets/migrations/migrate%20flexmark-java%200_42_x%20to%200_50_0.xml
 
+
+[#391, PR: Fix: CRLF line separator in fenced code blocks produce redundant CR.]: https://github.com/vsch/flexmark-java/pull/391
+[#387, JUnit is in the compile scope]: https://github.com/vsch/flexmark-java/pull/387
+[#396, DocumentParser stops reading too early resulting in the document being cut off]: https://github.com/vsch/flexmark-java/issues/396
diff --git a/flexmark-all/pom.xml b/flexmark-all/pom.xml
index 89ebf31ab..7aea9c9b5 100644
--- a/flexmark-all/pom.xml
+++ b/flexmark-all/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-all</artifactId>
diff --git a/flexmark-core-test/pom.xml b/flexmark-core-test/pom.xml
index 96aaa1ad1..e20bf2ccd 100644
--- a/flexmark-core-test/pom.xml
+++ b/flexmark-core-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-core-test</artifactId>
diff --git a/flexmark-docx-converter/pom.xml b/flexmark-docx-converter/pom.xml
index 56e101ee2..d61c3db8e 100644
--- a/flexmark-docx-converter/pom.xml
+++ b/flexmark-docx-converter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-docx-converter</artifactId>
diff --git a/flexmark-ext-abbreviation/pom.xml b/flexmark-ext-abbreviation/pom.xml
index f40f9b882..7fd48e6b4 100644
--- a/flexmark-ext-abbreviation/pom.xml
+++ b/flexmark-ext-abbreviation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-abbreviation</artifactId>
diff --git a/flexmark-ext-admonition/pom.xml b/flexmark-ext-admonition/pom.xml
index 1c0c82897..ab16cf483 100644
--- a/flexmark-ext-admonition/pom.xml
+++ b/flexmark-ext-admonition/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-admonition</artifactId>
diff --git a/flexmark-ext-anchorlink/pom.xml b/flexmark-ext-anchorlink/pom.xml
index eedcb70af..75221bdfa 100644
--- a/flexmark-ext-anchorlink/pom.xml
+++ b/flexmark-ext-anchorlink/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-anchorlink</artifactId>
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.vladsch.flexmark</groupId>
             <artifactId>flexmark-jira-converter</artifactId>
-            <version>0.61.0</version>
+            <version>0.61.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/flexmark-ext-aside/pom.xml b/flexmark-ext-aside/pom.xml
index 48745988b..07295bfa8 100644
--- a/flexmark-ext-aside/pom.xml
+++ b/flexmark-ext-aside/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-aside</artifactId>
diff --git a/flexmark-ext-attributes/pom.xml b/flexmark-ext-attributes/pom.xml
index fec41b5fe..b5e860e76 100644
--- a/flexmark-ext-attributes/pom.xml
+++ b/flexmark-ext-attributes/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-attributes</artifactId>
diff --git a/flexmark-ext-autolink/pom.xml b/flexmark-ext-autolink/pom.xml
index 894c47bfb..d2c4214f1 100644
--- a/flexmark-ext-autolink/pom.xml
+++ b/flexmark-ext-autolink/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-autolink</artifactId>
diff --git a/flexmark-ext-definition/pom.xml b/flexmark-ext-definition/pom.xml
index 6519291c9..fc033af36 100644
--- a/flexmark-ext-definition/pom.xml
+++ b/flexmark-ext-definition/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-definition</artifactId>
diff --git a/flexmark-ext-emoji/pom.xml b/flexmark-ext-emoji/pom.xml
index bf8afd4f3..b70f46b53 100644
--- a/flexmark-ext-emoji/pom.xml
+++ b/flexmark-ext-emoji/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-emoji</artifactId>
diff --git a/flexmark-ext-enumerated-reference/pom.xml b/flexmark-ext-enumerated-reference/pom.xml
index f72cf580e..25382d6b5 100644
--- a/flexmark-ext-enumerated-reference/pom.xml
+++ b/flexmark-ext-enumerated-reference/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-enumerated-reference</artifactId>
diff --git a/flexmark-ext-escaped-character/pom.xml b/flexmark-ext-escaped-character/pom.xml
index acff9482c..01566e9c5 100644
--- a/flexmark-ext-escaped-character/pom.xml
+++ b/flexmark-ext-escaped-character/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-escaped-character</artifactId>
diff --git a/flexmark-ext-footnotes/pom.xml b/flexmark-ext-footnotes/pom.xml
index c7f56e6cc..ea4047546 100644
--- a/flexmark-ext-footnotes/pom.xml
+++ b/flexmark-ext-footnotes/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-footnotes</artifactId>
diff --git a/flexmark-ext-gfm-issues/pom.xml b/flexmark-ext-gfm-issues/pom.xml
index 38458dd64..a465ecc30 100644
--- a/flexmark-ext-gfm-issues/pom.xml
+++ b/flexmark-ext-gfm-issues/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-gfm-issues</artifactId>
diff --git a/flexmark-ext-gfm-strikethrough/pom.xml b/flexmark-ext-gfm-strikethrough/pom.xml
index c93af391e..19887a0d4 100644
--- a/flexmark-ext-gfm-strikethrough/pom.xml
+++ b/flexmark-ext-gfm-strikethrough/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-gfm-strikethrough</artifactId>
diff --git a/flexmark-ext-gfm-tasklist/pom.xml b/flexmark-ext-gfm-tasklist/pom.xml
index 4f6ed9f8a..5ee565a1d 100644
--- a/flexmark-ext-gfm-tasklist/pom.xml
+++ b/flexmark-ext-gfm-tasklist/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-gfm-tasklist</artifactId>
diff --git a/flexmark-ext-gfm-users/pom.xml b/flexmark-ext-gfm-users/pom.xml
index 07180ad42..350e7cee9 100644
--- a/flexmark-ext-gfm-users/pom.xml
+++ b/flexmark-ext-gfm-users/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-gfm-users</artifactId>
diff --git a/flexmark-ext-gitlab/pom.xml b/flexmark-ext-gitlab/pom.xml
index 66c4bfde5..e397a9ef0 100644
--- a/flexmark-ext-gitlab/pom.xml
+++ b/flexmark-ext-gitlab/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-gitlab</artifactId>
diff --git a/flexmark-ext-ins/pom.xml b/flexmark-ext-ins/pom.xml
index c8484061a..5efaa52b6 100644
--- a/flexmark-ext-ins/pom.xml
+++ b/flexmark-ext-ins/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-ins</artifactId>
diff --git a/flexmark-ext-jekyll-front-matter/pom.xml b/flexmark-ext-jekyll-front-matter/pom.xml
index 520a032fd..833e5f961 100644
--- a/flexmark-ext-jekyll-front-matter/pom.xml
+++ b/flexmark-ext-jekyll-front-matter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-jekyll-front-matter</artifactId>
diff --git a/flexmark-ext-jekyll-tag/pom.xml b/flexmark-ext-jekyll-tag/pom.xml
index 13f3bff32..0306d2347 100644
--- a/flexmark-ext-jekyll-tag/pom.xml
+++ b/flexmark-ext-jekyll-tag/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-jekyll-tag</artifactId>
diff --git a/flexmark-ext-macros/pom.xml b/flexmark-ext-macros/pom.xml
index c0ac74b3f..3d3834174 100644
--- a/flexmark-ext-macros/pom.xml
+++ b/flexmark-ext-macros/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-macros</artifactId>
diff --git a/flexmark-ext-media-tags/pom.xml b/flexmark-ext-media-tags/pom.xml
index 0f3475f1d..70a6b9bcc 100644
--- a/flexmark-ext-media-tags/pom.xml
+++ b/flexmark-ext-media-tags/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-media-tags</artifactId>
diff --git a/flexmark-ext-spec-example/pom.xml b/flexmark-ext-spec-example/pom.xml
index 8577467dd..3aac29574 100644
--- a/flexmark-ext-spec-example/pom.xml
+++ b/flexmark-ext-spec-example/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-spec-example</artifactId>
diff --git a/flexmark-ext-superscript/pom.xml b/flexmark-ext-superscript/pom.xml
index a1a65eed0..a80529159 100644
--- a/flexmark-ext-superscript/pom.xml
+++ b/flexmark-ext-superscript/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-superscript</artifactId>
diff --git a/flexmark-ext-tables/pom.xml b/flexmark-ext-tables/pom.xml
index ad1df01ec..63d66aa50 100644
--- a/flexmark-ext-tables/pom.xml
+++ b/flexmark-ext-tables/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-tables</artifactId>
diff --git a/flexmark-ext-toc/pom.xml b/flexmark-ext-toc/pom.xml
index 5921da3cd..62275f67a 100644
--- a/flexmark-ext-toc/pom.xml
+++ b/flexmark-ext-toc/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-toc</artifactId>
diff --git a/flexmark-ext-typographic/pom.xml b/flexmark-ext-typographic/pom.xml
index 8079ec841..5f49b057f 100644
--- a/flexmark-ext-typographic/pom.xml
+++ b/flexmark-ext-typographic/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-typographic</artifactId>
diff --git a/flexmark-ext-wikilink/pom.xml b/flexmark-ext-wikilink/pom.xml
index b9ad1281d..0a38ad3fa 100644
--- a/flexmark-ext-wikilink/pom.xml
+++ b/flexmark-ext-wikilink/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-wikilink</artifactId>
diff --git a/flexmark-ext-xwiki-macros/pom.xml b/flexmark-ext-xwiki-macros/pom.xml
index 3ddea7ab9..d828229a3 100644
--- a/flexmark-ext-xwiki-macros/pom.xml
+++ b/flexmark-ext-xwiki-macros/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-xwiki-macros</artifactId>
diff --git a/flexmark-ext-yaml-front-matter/pom.xml b/flexmark-ext-yaml-front-matter/pom.xml
index 016853316..d04322866 100644
--- a/flexmark-ext-yaml-front-matter/pom.xml
+++ b/flexmark-ext-yaml-front-matter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>flexmark-java</artifactId>
         <groupId>com.vladsch.flexmark</groupId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-yaml-front-matter</artifactId>
diff --git a/flexmark-ext-youtube-embedded/pom.xml b/flexmark-ext-youtube-embedded/pom.xml
index bab8bfd4e..ec9dfbd5d 100644
--- a/flexmark-ext-youtube-embedded/pom.xml
+++ b/flexmark-ext-youtube-embedded/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>flexmark-java</artifactId>
         <groupId>com.vladsch.flexmark</groupId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/flexmark-ext-zzzzzz/pom.xml b/flexmark-ext-zzzzzz/pom.xml
index f97308f20..af22b726e 100644
--- a/flexmark-ext-zzzzzz/pom.xml
+++ b/flexmark-ext-zzzzzz/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-ext-zzzzzz</artifactId>
diff --git a/flexmark-html2md-converter/pom.xml b/flexmark-html2md-converter/pom.xml
index 08693b907..80d29488f 100644
--- a/flexmark-html2md-converter/pom.xml
+++ b/flexmark-html2md-converter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-html2md-converter</artifactId>
diff --git a/flexmark-integration-test/pom.xml b/flexmark-integration-test/pom.xml
index 86a391653..2d6bdf11a 100644
--- a/flexmark-integration-test/pom.xml
+++ b/flexmark-integration-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-integration-test</artifactId>
diff --git a/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/NodeRendererSample2.java b/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/NodeRendererSample2.java
new file mode 100644
index 000000000..7563730d3
--- /dev/null
+++ b/flexmark-java-samples/src/com/vladsch/flexmark/java/samples/NodeRendererSample2.java
@@ -0,0 +1,124 @@
+package com.vladsch.flexmark.java.samples;
+
+import com.vladsch.flexmark.ast.Emphasis;
+import com.vladsch.flexmark.ast.Paragraph;
+import com.vladsch.flexmark.ast.SoftLineBreak;
+import com.vladsch.flexmark.ast.StrongEmphasis;
+import com.vladsch.flexmark.ext.autolink.AutolinkExtension;
+import com.vladsch.flexmark.html.HtmlRenderer;
+import com.vladsch.flexmark.html.HtmlWriter;
+import com.vladsch.flexmark.html.renderer.NodeRenderer;
+import com.vladsch.flexmark.html.renderer.NodeRendererContext;
+import com.vladsch.flexmark.html.renderer.NodeRendererFactory;
+import com.vladsch.flexmark.html.renderer.NodeRenderingHandler;
+import com.vladsch.flexmark.parser.Parser;
+import com.vladsch.flexmark.test.util.AstCollectingVisitor;
+import com.vladsch.flexmark.util.ast.Node;
+import com.vladsch.flexmark.util.data.DataHolder;
+import com.vladsch.flexmark.util.data.MutableDataHolder;
+import com.vladsch.flexmark.util.data.MutableDataSet;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+public class NodeRendererSample2 {
+    static class SampleExtension implements HtmlRenderer.HtmlRendererExtension {
+        @Override
+        public void rendererOptions(@NotNull MutableDataHolder options) {
+            // add any configuration settings to options you want to apply to everything, here
+        }
+
+        @Override
+        public void extend(@NotNull HtmlRenderer.Builder htmlRendererBuilder, @NotNull String rendererType) {
+            htmlRendererBuilder.nodeRendererFactory(new SampleNodeRenderer.Factory());
+        }
+
+        static SampleExtension create() {
+            return new SampleExtension();
+        }
+    }
+
+    static class SampleNodeRenderer implements NodeRenderer {
+        public SampleNodeRenderer(DataHolder options) {
+
+        }
+
+        @Override
+        public Set<NodeRenderingHandler<?>> getNodeRenderingHandlers() {
+            return new HashSet<>(Arrays.asList(
+                    new NodeRenderingHandler<>(Paragraph.class, this::render),
+                    new NodeRenderingHandler<>(SoftLineBreak.class, this::render),
+                    new NodeRenderingHandler<>(StrongEmphasis.class, this::render),
+                    new NodeRenderingHandler<>(Emphasis.class, this::render)
+            ));
+        }
+
+        private void render(Paragraph node, NodeRendererContext context, HtmlWriter html) {
+            context.renderChildren(node);
+            if (node.getNext() != null) {
+                html.tag("br/").line();
+            }
+        }
+
+        private void render(SoftLineBreak node, NodeRendererContext context, HtmlWriter html) {
+            html.tag("br/").line();
+        }
+
+        private void render(StrongEmphasis node, NodeRendererContext context, HtmlWriter html) {
+            html.tag("b");
+            context.renderChildren(node);
+            html.tag("/b");
+        }
+
+        private void render(Emphasis node, NodeRendererContext context, HtmlWriter html) {
+            html.tag("i");
+            context.renderChildren(node);
+            html.tag("/i");
+        }
+
+        public static class Factory implements NodeRendererFactory {
+            @NotNull
+            @Override
+            public NodeRenderer apply(@NotNull DataHolder options) {
+                return new SampleNodeRenderer(options);
+            }
+        }
+    }
+
+    static String commonMark(String markdown) {
+        MutableDataHolder options = new MutableDataSet();
+        options.set(Parser.EXTENSIONS, Arrays.asList(AutolinkExtension.create(), SampleExtension.create()));
+
+        // change soft break to hard break
+        options.set(HtmlRenderer.SOFT_BREAK, "<br/>");
+
+        Parser parser = Parser.builder(options).build();
+        Node document = parser.parse(markdown);
+        String ast = new AstCollectingVisitor().collectAndGetAstText(document);
+        System.out.println(markdown);
+        System.out.println("---------------------------------");
+        System.out.println(ast);
+        System.out.println("---------------------------------");
+
+        HtmlRenderer renderer = HtmlRenderer.builder(options).build();
+        String html = renderer.render(document);
+        return html;
+    }
+
+    public static void main(String[] args) {
+        String html = commonMark("" +
+                "**bold text**\n" +
+                "\n" +
+                "*italic text*\n" +
+                "");
+        System.out.println(html);
+        System.out.println("---------------------------------");
+        String html2 = commonMark("" +
+                "**bold text**\n" +
+                "*italic text*\n" +
+                "");
+        System.out.println(html2);
+    }
+}
diff --git a/flexmark-jira-converter/pom.xml b/flexmark-jira-converter/pom.xml
index 95cbf844e..0bad6092e 100644
--- a/flexmark-jira-converter/pom.xml
+++ b/flexmark-jira-converter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-jira-converter</artifactId>
diff --git a/flexmark-osgi/pom.xml b/flexmark-osgi/pom.xml
index e6ffa4268..893c63f5c 100644
--- a/flexmark-osgi/pom.xml
+++ b/flexmark-osgi/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-osgi</artifactId>
diff --git a/flexmark-pdf-converter/pom.xml b/flexmark-pdf-converter/pom.xml
index 48fa7abc7..f4e3e0926 100644
--- a/flexmark-pdf-converter/pom.xml
+++ b/flexmark-pdf-converter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-pdf-converter</artifactId>
diff --git a/flexmark-profile-pegdown/pom.xml b/flexmark-profile-pegdown/pom.xml
index 82de713cb..660f8ecf5 100644
--- a/flexmark-profile-pegdown/pom.xml
+++ b/flexmark-profile-pegdown/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-profile-pegdown</artifactId>
diff --git a/flexmark-test-specs/pom.xml b/flexmark-test-specs/pom.xml
index 020dec035..fbd18a1a2 100644
--- a/flexmark-test-specs/pom.xml
+++ b/flexmark-test-specs/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-test-specs</artifactId>
diff --git a/flexmark-test-util/pom.xml b/flexmark-test-util/pom.xml
index 71c2d99cf..3ff51df5c 100644
--- a/flexmark-test-util/pom.xml
+++ b/flexmark-test-util/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-test-util</artifactId>
diff --git a/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/spec/IParseBase.java b/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/spec/IParseBase.java
index 25d82f693..bff1a3bc6 100644
--- a/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/spec/IParseBase.java
+++ b/flexmark-test-util/src/main/java/com/vladsch/flexmark/test/util/spec/IParseBase.java
@@ -47,8 +47,8 @@ public boolean transferReferences(@NotNull Document document, @NotNull Document
 
         while (true) {
             int charsRead = bufferedReader.read(buffer);
+            if (charsRead < 0) break;
             file.append(buffer, 0, charsRead);
-            if (charsRead < buffer.length) break;
         }
 
         BasedSequence source = BasedSequence.of(file.toString());
diff --git a/flexmark-tree-iteration/pom.xml b/flexmark-tree-iteration/pom.xml
index b7cf8a63a..b41d3a320 100644
--- a/flexmark-tree-iteration/pom.xml
+++ b/flexmark-tree-iteration/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-tree-iteration</artifactId>
diff --git a/flexmark-util-ast/pom.xml b/flexmark-util-ast/pom.xml
index a9cb598a7..fe6a7a91c 100644
--- a/flexmark-util-ast/pom.xml
+++ b/flexmark-util-ast/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util-ast</artifactId>
diff --git a/flexmark-util-builder/pom.xml b/flexmark-util-builder/pom.xml
index ce9c1767c..520d350eb 100644
--- a/flexmark-util-builder/pom.xml
+++ b/flexmark-util-builder/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util-builder</artifactId>
diff --git a/flexmark-util-collection/pom.xml b/flexmark-util-collection/pom.xml
index 69e602535..ebedd5046 100644
--- a/flexmark-util-collection/pom.xml
+++ b/flexmark-util-collection/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util-collection</artifactId>
diff --git a/flexmark-util-data/pom.xml b/flexmark-util-data/pom.xml
index f5d532500..a9f8f5d3e 100644
--- a/flexmark-util-data/pom.xml
+++ b/flexmark-util-data/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util-data</artifactId>
diff --git a/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/ScopedDataSet.java b/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/ScopedDataSet.java
index 9aca45114..4ed108509 100644
--- a/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/ScopedDataSet.java
+++ b/flexmark-util-data/src/main/java/com/vladsch/flexmark/util/data/ScopedDataSet.java
@@ -3,10 +3,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 public class ScopedDataSet extends DataSet {
     protected final DataHolder parent;
@@ -28,15 +25,8 @@ public DataHolder getParent() {
     @Override
     public @NotNull Map<? extends DataKeyBase<?>, Object> getAll() {
         if (parent != null) {
-
-            HashMap<DataKeyBase<?>, Object> all = new HashMap<>(super.getAll());
-
-            for (DataKeyBase<?> key : parent.getKeys()) {
-                if (!contains(key)) {
-                    all.put(key, key.get(parent));
-                }
-            }
-
+            HashMap<DataKeyBase<?>, Object> all = new HashMap<>(parent.getAll());
+            all.putAll(super.getAll());
             return all;
         } else {
             return super.getAll();
@@ -46,21 +36,21 @@ public DataHolder getParent() {
     @Override
     public @NotNull Collection<? extends DataKeyBase<?>> getKeys() {
         if (parent != null) {
-
-            ArrayList<DataKeyBase<?>> all = new ArrayList<>(super.getKeys());
-
-            for (DataKeyBase<?> key : parent.getKeys()) {
-                if (!contains(key)) {
-                    all.add(key);
-                }
-            }
-
+            HashSet<DataKeyBase<?>> all = new HashSet<>(parent.getKeys());
+            all.addAll(super.getKeys());
             return all;
         } else {
             return super.getKeys();
         }
     }
 
+    @Override
+    public @NotNull MutableDataSet toMutable() {
+        MutableDataSet mutableDataSet = new MutableDataSet();
+        mutableDataSet.dataSet.putAll(super.getAll());
+        return parent != null ? new MutableScopedDataSet(parent, mutableDataSet) : mutableDataSet;
+    }
+
     @Override
     public boolean contains(@NotNull DataKeyBase<?> key) {
         return super.contains(key) || (parent != null && parent.contains(key));
diff --git a/flexmark-util-dependency/pom.xml b/flexmark-util-dependency/pom.xml
index 22638757b..c633917b0 100644
--- a/flexmark-util-dependency/pom.xml
+++ b/flexmark-util-dependency/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util-dependency</artifactId>
diff --git a/flexmark-util-experimental/pom.xml b/flexmark-util-experimental/pom.xml
index 66c615383..e8de10ec4 100644
--- a/flexmark-util-experimental/pom.xml
+++ b/flexmark-util-experimental/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util-experimental</artifactId>
diff --git a/flexmark-util-format/pom.xml b/flexmark-util-format/pom.xml
index 556eb973e..468199cb0 100644
--- a/flexmark-util-format/pom.xml
+++ b/flexmark-util-format/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util-format</artifactId>
diff --git a/flexmark-util-html/pom.xml b/flexmark-util-html/pom.xml
index 73f8f54ec..a00914899 100644
--- a/flexmark-util-html/pom.xml
+++ b/flexmark-util-html/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util-html</artifactId>
diff --git a/flexmark-util-misc/pom.xml b/flexmark-util-misc/pom.xml
index 356e47741..886a5b8e5 100644
--- a/flexmark-util-misc/pom.xml
+++ b/flexmark-util-misc/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util-misc</artifactId>
diff --git a/flexmark-util-options/pom.xml b/flexmark-util-options/pom.xml
index 7a6ab4966..a746693a2 100644
--- a/flexmark-util-options/pom.xml
+++ b/flexmark-util-options/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util-options</artifactId>
diff --git a/flexmark-util-sequence/pom.xml b/flexmark-util-sequence/pom.xml
index 4927660a5..e3d067067 100644
--- a/flexmark-util-sequence/pom.xml
+++ b/flexmark-util-sequence/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util-sequence</artifactId>
diff --git a/flexmark-util-visitor/pom.xml b/flexmark-util-visitor/pom.xml
index 5fef59891..2a6226966 100644
--- a/flexmark-util-visitor/pom.xml
+++ b/flexmark-util-visitor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util-visitor</artifactId>
diff --git a/flexmark-util/pom.xml b/flexmark-util/pom.xml
index f28f8cb44..2899ef58b 100644
--- a/flexmark-util/pom.xml
+++ b/flexmark-util/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-util</artifactId>
diff --git a/flexmark-youtrack-converter/pom.xml b/flexmark-youtrack-converter/pom.xml
index 90585826a..87236d439 100644
--- a/flexmark-youtrack-converter/pom.xml
+++ b/flexmark-youtrack-converter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark-youtrack-converter</artifactId>
diff --git a/flexmark/pom.xml b/flexmark/pom.xml
index a6db4e825..f2d834edf 100644
--- a/flexmark/pom.xml
+++ b/flexmark/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-java</artifactId>
-        <version>0.61.0</version>
+        <version>0.61.2</version>
     </parent>
 
     <artifactId>flexmark</artifactId>
diff --git a/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/DocumentParser.java b/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/DocumentParser.java
index 481b8bf37..c4a539ecf 100644
--- a/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/DocumentParser.java
+++ b/flexmark/src/main/java/com/vladsch/flexmark/parser/internal/DocumentParser.java
@@ -328,7 +328,6 @@ public Document parse(Reader input) throws IOException {
             // issue #91
             if (charsRead < 0) break;
             file.append(buffer, 0, charsRead);
-            if (charsRead < buffer.length) break;
         }
 
         CharSequence source = BasedSequence.of(file.toString());
diff --git a/pom.xml b/pom.xml
index a7ac72ada..02aa9cb0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>com.vladsch.flexmark</groupId>
     <artifactId>flexmark-java</artifactId>
-    <version>0.61.0</version>
+    <version>0.61.2</version>
     <name>flexmark-java</name>
     <description>
         Java re-implementation of commonmark-java based parser, with AST reflecting source elements, full source position tracking, greater parser extensibility.