diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..482781f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,47 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,py}]
+charset = utf-8
+
+# 4 space indentation
+[*.py]
+indent_style = space
+indent_size = 4
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+# Indentation override for all JS under lib directory
+[lib/**.js]
+indent_style = space
+indent_size = 2
+
+# Matches the exact files either package.json or .travis.yml
+[{package.json,.travis.yml}]
+indent_style = space
+indent_size = 2
+
+[*.{go,c,cpp}]
+indent_style = tab
+tab_width = 4
+trim_trailing_whitespace = true
+
+
+[*.{py,java,cs}]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.{c,cpp,java,js}]
+block_comment_start = /*
+block_comment = *
+block_comment_end = */