diff --git a/.clang-tidy b/.clang-tidy
index f6ce8611..3acf30c3 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,6 @@
 #Checks: '*,-clang-analyzer-alpha.*'
-Checks: '-*,google-readability-casting,llvm-namespace-comment,performance-unnecessary-value-param,llvm-include-order,misc-throw-by-value-catch-by-reference,readability-container-size-empty,google-runtime-references,modernize*'
+#Checks: '-*,google-readability-casting,llvm-namespace-comment,performance-unnecessary-value-param,llvm-include-order,misc-throw-by-value-catch-by-reference,readability-container-size-empty,google-runtime-references,modernize*'
+Checks: '-*,llvm-namespace-comment'
 HeaderFilterRegex: '.*hpp'
 CheckOptions:
 - key:             readability-braces-around-statements.ShortStatementLines
diff --git a/examples/try2.cpp b/examples/try2.cpp
index e0852151..47e41dad 100644
--- a/examples/try2.cpp
+++ b/examples/try2.cpp
@@ -1,7 +1,9 @@
 #include "CLI/CLI.hpp"
+#include "CLI/Timer.hpp"
 
 
 int main (int argc, char** argv) {
+    CLI::AutoTimer("This is a timer");
 
     CLI::App app("K3Pi goofit fitter");
 
diff --git a/include/CLI/App.hpp b/include/CLI/App.hpp
index 8cf30a6e..645b7e4c 100644
--- a/include/CLI/App.hpp
+++ b/include/CLI/App.hpp
@@ -29,7 +29,7 @@ namespace CLI {
 namespace detail {
 enum class Classifer {NONE, POSITIONAL_MARK, SHORT, LONG, SUBCOMMAND};
 struct AppFriend;
-}
+} // namespace detail
 
 class App;
 
@@ -1178,7 +1178,7 @@ struct AppFriend {
     }
 
 };
-}
+} // namespace detail
 
-}
+} // namespace CLI
 
diff --git a/include/CLI/Error.hpp b/include/CLI/Error.hpp
index f28fc078..897e53c1 100644
--- a/include/CLI/Error.hpp
+++ b/include/CLI/Error.hpp
@@ -166,4 +166,4 @@ struct OptionNotFound : public Error {
 
 /// @}
 
-}
+} // namespace CLI
diff --git a/include/CLI/Ini.hpp b/include/CLI/Ini.hpp
index e29142c1..e3c32085 100644
--- a/include/CLI/Ini.hpp
+++ b/include/CLI/Ini.hpp
@@ -113,5 +113,5 @@ inline std::vector<ini_ret_t> parse_ini(const std::string &name) {
 }
 
 
-}
-}
+} // namespace detail
+} // namespace CLI
diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
index 98090b38..0b63300b 100644
--- a/include/CLI/Option.hpp
+++ b/include/CLI/Option.hpp
@@ -493,4 +493,4 @@ public:
 
 
 
-}
+} // namespace CLI
diff --git a/include/CLI/Split.hpp b/include/CLI/Split.hpp
index f909495b..d461ca95 100644
--- a/include/CLI/Split.hpp
+++ b/include/CLI/Split.hpp
@@ -89,5 +89,5 @@ inline std::tuple<std::vector<std::string>,std::vector<std::string>, std::string
 }
 
 
-}
-}
+} // namespace detail
+} // namespace CLI
diff --git a/include/CLI/StringTools.hpp b/include/CLI/StringTools.hpp
index 834bee14..db86ac5c 100644
--- a/include/CLI/StringTools.hpp
+++ b/include/CLI/StringTools.hpp
@@ -197,5 +197,5 @@ inline std::vector<std::string> split_up(std::string str) {
     return output;
 }
 
-}
-}
+} // namespace detail
+} // namespace CLI
diff --git a/include/CLI/Timer.hpp b/include/CLI/Timer.hpp
index 7ff65945..60a3e002 100644
--- a/include/CLI/Timer.hpp
+++ b/include/CLI/Timer.hpp
@@ -123,7 +123,7 @@ public:
     }
 };
 
-}
+} // namespace CLI
 
 /// This prints out the time if shifted into a std::cout like stream.
 inline std::ostream & operator<< (std::ostream& in, const CLI::Timer& timer) {
diff --git a/include/CLI/TypeTools.hpp b/include/CLI/TypeTools.hpp
index 6a49f0e2..c1dab70f 100644
--- a/include/CLI/TypeTools.hpp
+++ b/include/CLI/TypeTools.hpp
@@ -135,5 +135,5 @@ namespace detail {
     }
 
 
-}
-}
+} // namespace detail
+} // namespace CLI
diff --git a/include/CLI/Validators.hpp b/include/CLI/Validators.hpp
index 9da47eda..82b1e9c2 100644
--- a/include/CLI/Validators.hpp
+++ b/include/CLI/Validators.hpp
@@ -86,4 +86,4 @@ std::function<bool(std::string)> Range(T max) {
 
 /// @}
 
-}
+} // namespace CLI