diff --git a/.editorconfig b/.editorconfig
index d4eed840..5b90934c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,7 +1,18 @@
+# http://editorconfig.org
 root = true
 
 [*]
+charset = utf-8
 end_of_line = lf
-insert_final_newline = false
-indent_style = space
 indent_size = 2
+indent_style = space
+insert_final_newline = true
+max_line_length = 80
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = 0
+trim_trailing_whitespace = false
+
+[COMMIT_EDITMSG]
+max_line_length = 0
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 00000000..cfb2abe5
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,5 @@
+{
+  "printWidth": 100,
+  "parser": "typescript",
+  "singleQuote": true
+}
diff --git a/package.json b/package.json
index 746c98f1..2e1bfff3 100644
--- a/package.json
+++ b/package.json
@@ -76,6 +76,7 @@
     "merge2": "~1.1.0",
     "mkdirp": "~0.5.1",
     "npm-run-all": "~4.0.2",
+    "prettier": "^1.6.1",
     "pump": "~1.0.2",
     "rimraf": "~2.6.1",
     "shx": "~0.2.2",