diff --git a/.vimrc b/.vimrc
index f532f87..ed6da2d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -208,9 +208,9 @@ else
 endif
 
 if &expandtab
-        let g:clang_style="{BasedOnStyle: LLVM, AlignConsecutiveAssignments: true, UseTab: Never, BreakBeforeBraces: Linux, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, IndentWidth: " . &tabstop ."}"
+        let g:clang_style="{BasedOnStyle: LLVM, AlignConsecutiveAssignments: true, AlignTrailingComments: true, UseTab: Never, BreakBeforeBraces: Linux, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 95, IndentWidth: " . &tabstop ."}"
 else
-        let g:clang_style="{BasedOnStyle: LLVM, AlignConsecutiveAssignments: true, UseTab: Always, BreakBeforeBraces: Linux, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, IndentWidth: " . &tabstop ."}"
+        let g:clang_style="{BasedOnStyle: LLVM, AlignConsecutiveAssignments: true, AlignTrailingComments: true, UseTab: Always, BreakBeforeBraces: Linux, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 95, IndentWidth: " . &tabstop ."}"
 endif
 
 map <C-K> :pyf ~/.vim/syntax/clang-format.py<CR>