diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000000..6536f034e3
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,33 @@
+Standard: Cpp11
+UseTab: ForIndentation
+TabWidth: 1
+IndentWidth: 1 
+AccessModifierOffset: -1
+PointerAlignment: Left
+NamespaceIndentation: All
+ColumnLimit: 0
+BreakBeforeBraces: Allman
+BreakConstructorInitializersBeforeComma: true
+BreakBeforeBinaryOperators: false
+BreakBeforeTernaryOperators: false
+AlwaysBreakTemplateDeclarations: true
+AllowShortIfStatementsOnASingleLine: true
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: false
+AllowShortLoopsOnASingleLine: true
+Cpp11BracedListStyle: true
+IndentCaseLabels: false
+SortIncludes: false
+ReflowComments: true
+AlignConsecutiveAssignments: true
+AlignTrailingComments: true
+AlignAfterOpenBracket: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+BinPackArguments: true
+BinPackParameters: true
+AlwaysBreakAfterReturnType: None
+KeepEmptyLinesAtTheStartOfBlocks: true
+IndentWrappedFunctionNames: false
+
+#SpaceAfterTemplateKeyword: false
diff --git a/usertype.dat b/usertype.dat
new file mode 100644
index 0000000000..ad87350ca8
--- /dev/null
+++ b/usertype.dat
@@ -0,0 +1,2 @@
+throw_exception
+rethrow_exception