diff --git a/.clang-format b/.clang-format
index a204f046..9579501a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -4,6 +4,7 @@ AccessModifierOffset: 0
 AlignEscapedNewlinesLeft: false
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortFunctionsOnASingleLine: true
 AllowShortIfStatementsOnASingleLine: true
 AllowShortLoopsOnASingleLine: true
 AlwaysBreakBeforeMultilineStrings: true
@@ -11,14 +12,17 @@ AlwaysBreakTemplateDeclarations: false
 BinPackParameters: true 
 BreakBeforeBinaryOperators: false
 BreakBeforeBraces: Attach
+BreakConstructorInitializersBeforeComma: true
 ColumnLimit: 130
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 3
+#ContinuationIndentWidth:
 Cpp11BracedListStyle: true
 DerivePointerBinding : true
 IndentCaseLabels: true
 #IndentFunctionDeclarationAfterType:true
 IndentWidth: 1
+Language: Cpp
 MaxEmptyLinesToKeep: 3
 NamespaceIndentation : Inner
 PointerBindsToType: true
@@ -26,6 +30,7 @@ SpaceAfterControlStatementKeyword: true
 SpaceBeforeAssignmentOperators: true
 SpaceInEmptyParentheses: false
 SpacesInParentheses: false
+SpacesInAngles:false
 Standard: Cpp11
 TabWidth: 1
 UseTab: Never