diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ce6c5420..f1608c9a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,34 @@
-# Unreleased
-## (TBA)
+# v1.0.7
+## 01/04/2016
 
 1. [](#new)
-    * Added `composer create-project` as an additional installation method
-    * Added languages: Greek, Finnish, Norwegian, Polish, Portuguese, Romanian
-1. [](#improved)
+    * Added `composer create-project` as an additional installation method #585
+    * New optional system config setting to strip home from page routs and urls #561
+    * Added Greek, Finnish, Norwegian, Polish, Portuguese, and Romanian languages
+    * Added new `Page->topParent()` method to return top most parent of a page
+    * Added plugins configuration tab to debugger
+    * Added support for APCu and PHP7.0 via new Doctrine Cache release
+    * Added global setting for `twig_first` processing (false by default)
+    * New configuration options for Session settings #553
+1. [](#improved)   
+    * Use `URI->host()` for session domain
+    * Optimized core thumbnails saving 38% in file size
+    * Added new `bin/gpm index --installed-only` option 
+    * Improved GPM errors to provider more helpful diagnostic of issues
+    * Removed old hardcoded PHP version references
+    * Moved `onPageContentProcessed()` event so it's fired more reliably
+    * Maintain md5 keys during sorting of Assets #566
+    * Update to Caddyfile for Caddy web server
 1. [](#bugfix)
+    * Fixed an issue with cache/config checksum not being set on cache load
+    * Fix for page blueprint and theme inheritance issue #534
+    * Set `ZipBackup` timeout to 10 minutes if possible
+    * Fix case where we only have inline data for CSS or JS  #565 
+    * Fix `bin/grav sandbox` command to work with new `webserver-config` folder
+    * Fix for markdown attributes on external URLs
+    * Fixed issue where `data:` page header was acting as `publish_date:`
+    * Fix for special characters in URL parameters (e.g. /tag:c++) #541
+>>>>>>> Stashed changes
 
 # v1.0.6
 ## 12/22/2015
diff --git a/composer.json b/composer.json
index 1f9ea3173..1dd394581 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,6 @@
     "require": {
         "php": ">=5.5.9",
         "twig/twig": "~1.23",
-        "erusev/parsedown": "dev-master as 1.6.0",
         "erusev/parsedown-extra": "~0.7",
         "symfony/yaml": "~2.8",
         "symfony/console": "~2.8",
diff --git a/composer.lock b/composer.lock
index ca99857dc..60dd52fa6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "94131c9b1e1bafa572e1022ca6093544",
-    "content-hash": "fd3f9839960586cb8d7c841eb3a51610",
+    "hash": "85173a1bfa9ece106f687d69402d99d8",
+    "content-hash": "410b016e6cd8af6cd8ee9cdb6d5fd7a4",
     "packages": [
         {
             "name": "doctrine/cache",
@@ -130,16 +130,16 @@
         },
         {
             "name": "erusev/parsedown",
-            "version": "dev-master",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/getgrav/parsedown.git",
-                "reference": "e7443a2bd868e78946ae6a01a1b07d477ce6f4cc"
+                "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/getgrav/parsedown/zipball/e7443a2bd868e78946ae6a01a1b07d477ce6f4cc",
-                "reference": "e7443a2bd868e78946ae6a01a1b07d477ce6f4cc",
+                "url": "https://api.github.com/repos/getgrav/parsedown/zipball/3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
+                "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
                 "shasum": ""
             },
             "type": "library",
@@ -165,9 +165,9 @@
                 "parser"
             ],
             "support": {
-                "source": "https://github.com/getgrav/parsedown/tree/master"
+                "source": "https://github.com/getgrav/parsedown/tree/1.6.0"
             },
-            "time": "2015-12-19 03:45:14"
+            "time": "2015-10-04 16:44:32"
         },
         {
             "name": "erusev/parsedown-extra",
@@ -1137,17 +1137,9 @@
         }
     ],
     "packages-dev": [],
-    "aliases": [
-        {
-            "alias": "1.6.0",
-            "alias_normalized": "1.6.0.0",
-            "version": "9999999-dev",
-            "package": "erusev/parsedown"
-        }
-    ],
+    "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "erusev/parsedown": 20,
         "filp/whoops": 15
     },
     "prefer-stable": false,