diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..981083f
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,12 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [1.0.8]
+
+* Changelog added.
+* Added CWP keyword
+* Fix Postgres issues
+* Update translations
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 675c545..654d22a 100644
--- a/composer.json
+++ b/composer.json
@@ -18,5 +18,12 @@
 	{
 		"silverstripe/framework": "~3.1",
 		"silverstripe/cms": "~3.1"
+	},
+	"extra": 
+	{
+		"branch-alias": 
+		{
+			"dev-master": "1.0.x-dev"
+		}
 	}
 }