diff --git a/.editorconfig b/.editorconfig
index b0d1ce9..942148d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,8 +1,10 @@
 root = true
 
+[*]
+end_of_line = lf
+insert_final_newline = true
+
 [*.py]
 charset = utf-8
 indent_style = space
 indent_size = 4
-insert_final_newline = true
-end_of_line = lf
diff --git a/HISTORY.md b/HISTORY.md
index 16526f3..9bee6df 100755
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -10,6 +10,7 @@ master
 **Improvements**
 
 * Add Makefile and make codecov run only once. [#132](https://github.com/socialcopsdev/camelot/pull/132) by [Vaibhav Mule](https://github.com/vaibhavmule).
+* Add .editorconfig. [#151](https://github.com/socialcopsdev/camelot/pull/151) by [KOLANICH](https://github.com/KOLANICH).
 
 **Documentation**