diff --git a/.clang-format b/.clang-format
index e5323d2ecc87b958b99b89a3cbcf93cb3d1d7712..ad4911499e54f49caea1d2a9ac944df842be41c7 100644
--- a/.clang-format
+++ b/.clang-format
@@ -4,10 +4,12 @@ BasedOnStyle:    Google
 
 AccessModifierOffset: -4
 AllowShortLoopsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
 BreakBeforeBraces: Allman
+DerivePointerAlignment: false
+ExperimentalAutoDetectBinPacking: true
 IndentWidth:     4
+PointerAlignment: Left
+Standard:        C++11
 TabWidth:        4
 UseTab:          ForIndentation
-ExperimentalAutoDetectBinPacking: true
-Standard:        C++11