diff --git a/composer.json b/composer.json
index a70ddbe..a2951ce 100644
--- a/composer.json
+++ b/composer.json
@@ -28,10 +28,9 @@
     "require": {
         "php": ">=5.3.6",
         "ext-dom": "*",
-        "ext-mbstring": "*",
         "twig/twig": "^1.35",
         "symfony/yaml" : "^2.8",
-        "erusev/parsedown": "^1.6",
+        "erusev/parsedown": "^1.7",
         "erusev/parsedown-extra": "^0.7"
     },
     "suggest": {
diff --git a/config/config.yml.template b/config/config.yml.template
index 081a8f9..6a6ac19 100644
--- a/config/config.yml.template
+++ b/config/config.yml.template
@@ -35,7 +35,8 @@ content_config:
                                     #     See https://michelf.ca/projects/php-markdown/extra/ for more info
     breaks: false                   # A boolean indicating whether breaks in the markup should be reflected in the
                                     #     parsed contents of the page
-    escape: false                   # Escape HTML markup in your content files
+    escape: false                   # Escape HTML markup in your content files; don't confuse this with some sort of
+                                    #     safe mode, enabling this doesn't allow you to process untrusted user input!
     auto_urls: true                 # Automatically link URLs found in your markup
 
 ##
diff --git a/lib/Pico.php b/lib/Pico.php
index 9e170ba..6be1f64 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -1393,12 +1393,12 @@ class Pico
     }
 
     /**
-     * Returns the Parsedown Extra markdown parser
+     * Returns the Parsedown markdown parser
      *
      * This method triggers the `onParsedownRegistered` event when the
-     * Parsedown Extra parser wasn't initiated yet.
+     * Parsedown markdown parser wasn't initiated yet.
      *
-     * @return ParsedownExtra Parsedown Extra markdown parser
+     * @return Parsedown Parsedown markdown parser
      */
     public function getParsedown()
     {