diff --git a/README.md b/README.md
index 43a9b4b..e66aa6b 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,9 @@ $ dawson dev # start a development server
 A changelog is maintained in the [Releases page](https://github.com/dawson-org/dawson-cli/releases).
 
 ## Contributing
-[![js-semistandard-style](https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=plastic)](https://github.com/Flet/semistandard)  
+[![js-semistandard-style](https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=plastic)](https://github.com/Flet/semistandard) 
+[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)  
+
 Any contribution is very welcome! You may pick an Issue, fork and start working on that. Should you need any guidance or help please ask :)  
 
 We are currently testing only functions that are involved in the Template generation.  
diff --git a/package.json b/package.json
index d8a2153..463a2f9 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
     "prepublish": "npm run clean && npm run compile",
     "pre-commit": "npm run lint",
     "coverage-report": "nyc report --check-coverage --functions 100 --lines 100 --statements 100 --reporter=lcov",
-    "test": "npm run lint && nyc ava src/**/*.spec.js && npm run coverage-report"
+    "test": "npm run lint && nyc ava src/**/*.spec.js && npm run coverage-report",
+    "commit": "git-cz"
   },
   "engines": {
     "node": ">=6"
@@ -61,6 +62,8 @@
   "bin": "dist/index.js",
   "devDependencies": {
     "ava": "github:avajs/ava#make-snapshot-work",
+    "commitizen": "^2.9.6",
+    "cz-conventional-changelog": "^2.0.0",
     "deep-sort-object": "^1.0.1",
     "eslint": "3.18",
     "eslint-config-semistandard": "^8.0.0",