diff --git a/exprtk/Makefile b/exprtk/Makefile
index bdae9b1..dbb7697 100644
--- a/exprtk/Makefile
+++ b/exprtk/Makefile
@@ -2,7 +2,7 @@
 # **************************************************************
 # *         C++ Mathematical Expression Toolkit Library        *
 # *                                                            *
-# * Author: Arash Partow (1999-2021)                           *
+# * Author: Arash Partow (1999-2022)                           *
 # * URL: http://www.partow.net/programming/exprtk/index.html   *
 # *                                                            *
 # * Copyright notice:                                          *
diff --git a/exprtk/exprtk.hpp b/exprtk/exprtk.hpp
index 16a4839..4a4db54 100644
--- a/exprtk/exprtk.hpp
+++ b/exprtk/exprtk.hpp
@@ -2,7 +2,7 @@
  ******************************************************************
  *           C++ Mathematical Expression Toolkit Library          *
  *                                                                *
- * Author: Arash Partow (1999-2021)                               *
+ * Author: Arash Partow (1999-2022)                               *
  * URL: https://www.partow.net/programming/exprtk/index.html      *
  *                                                                *
  * Copyright notice:                                              *
@@ -37903,45 +37903,49 @@ namespace exprtk
 
          virtual ~base_func() {}
 
-         #define assign(Index)   \
+         #define exprtk_assign(Index)   \
          (*v[Index]) = v##Index; \
 
          inline void update(const T& v0)
          {
-            assign(0)
+            exprtk_assign(0)
          }
 
          inline void update(const T& v0, const T& v1)
          {
-            assign(0) assign(1)
+            exprtk_assign(0) exprtk_assign(1)
          }
 
          inline void update(const T& v0, const T& v1, const T& v2)
          {
-            assign(0) assign(1)
-            assign(2)
+            exprtk_assign(0) exprtk_assign(1)
+            exprtk_assign(2)
          }
 
          inline void update(const T& v0, const T& v1, const T& v2, const T& v3)
          {
-            assign(0) assign(1)
-            assign(2) assign(3)
+            exprtk_assign(0) exprtk_assign(1)
+            exprtk_assign(2) exprtk_assign(3)
          }
 
          inline void update(const T& v0, const T& v1, const T& v2, const T& v3, const T& v4)
          {
-            assign(0) assign(1)
-            assign(2) assign(3)
-            assign(4)
+            exprtk_assign(0) exprtk_assign(1)
+            exprtk_assign(2) exprtk_assign(3)
+            exprtk_assign(4)
          }
 
          inline void update(const T& v0, const T& v1, const T& v2, const T& v3, const T& v4, const T& v5)
          {
-            assign(0) assign(1)
-            assign(2) assign(3)
-            assign(4) assign(5)
+            exprtk_assign(0) exprtk_assign(1)
+            exprtk_assign(2) exprtk_assign(3)
+            exprtk_assign(4) exprtk_assign(5)
          }
 
+         #ifdef exprtk_assign
+         #undef exprtk_assign
+         #endif
+
          inline function_t& setup(expression_t& expr)
          {
             expression = expr;
@@ -40682,11 +40686,11 @@ namespace exprtk
    namespace information
    {
       static const char* library = "Mathematical Expression Toolkit";
-      static const char* version = "2.718281828459045235360287471352"
-                                   "66249775724709369995957496696762"
-                                   "77240766303535475945713821785251"
-                                   "66427427466391932003059921817413";
-      static const char* date    = "20210101";
+      static const char* version = "2.7182818284590452353602874713526"
+                                   "624977572470936999595749669676277"
+                                   "240766303535475945713821785251664"
+                                   "274274663919320030599218174135966";
+      static const char* date    = "20220101";
 
       static inline std::string data()
       {
diff --git a/exprtk/exprtk_benchmark.cpp b/exprtk/exprtk_benchmark.cpp
index 637def5..09472fb 100644
--- a/exprtk/exprtk_benchmark.cpp
+++ b/exprtk/exprtk_benchmark.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * ExprTk vs Native Benchmarks                                *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_01.cpp b/exprtk/exprtk_simple_example_01.cpp
index f1fb113..fa6d661 100644
--- a/exprtk/exprtk_simple_example_01.cpp
+++ b/exprtk/exprtk_simple_example_01.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 1                                           *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_02.cpp b/exprtk/exprtk_simple_example_02.cpp
index ef7f70c..927c431 100644
--- a/exprtk/exprtk_simple_example_02.cpp
+++ b/exprtk/exprtk_simple_example_02.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 2                                           *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_03.cpp b/exprtk/exprtk_simple_example_03.cpp
index 0de505e..709b9bf 100644
--- a/exprtk/exprtk_simple_example_03.cpp
+++ b/exprtk/exprtk_simple_example_03.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 3                                           *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_04.cpp b/exprtk/exprtk_simple_example_04.cpp
index 0b25ec5..15cbc39 100644
--- a/exprtk/exprtk_simple_example_04.cpp
+++ b/exprtk/exprtk_simple_example_04.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 4                                           *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_05.cpp b/exprtk/exprtk_simple_example_05.cpp
index 4450fb2..e185ee0 100644
--- a/exprtk/exprtk_simple_example_05.cpp
+++ b/exprtk/exprtk_simple_example_05.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 5                                           *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_06.cpp b/exprtk/exprtk_simple_example_06.cpp
index 2475905..395ec76 100644
--- a/exprtk/exprtk_simple_example_06.cpp
+++ b/exprtk/exprtk_simple_example_06.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 6                                           *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_07.cpp b/exprtk/exprtk_simple_example_07.cpp
index ac7d7e2..a5fcdaf 100644
--- a/exprtk/exprtk_simple_example_07.cpp
+++ b/exprtk/exprtk_simple_example_07.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 7                                           *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_08.cpp b/exprtk/exprtk_simple_example_08.cpp
index f2b76c7..338bbf4 100644
--- a/exprtk/exprtk_simple_example_08.cpp
+++ b/exprtk/exprtk_simple_example_08.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 8                                           *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_09.cpp b/exprtk/exprtk_simple_example_09.cpp
index 3a3892c..6b385cd 100644
--- a/exprtk/exprtk_simple_example_09.cpp
+++ b/exprtk/exprtk_simple_example_09.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 9                                           *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_10.cpp b/exprtk/exprtk_simple_example_10.cpp
index 7b11d7b..36669dc 100644
--- a/exprtk/exprtk_simple_example_10.cpp
+++ b/exprtk/exprtk_simple_example_10.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 10                                          *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_11.cpp b/exprtk/exprtk_simple_example_11.cpp
index e2ccf35..86c245e 100644
--- a/exprtk/exprtk_simple_example_11.cpp
+++ b/exprtk/exprtk_simple_example_11.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 11                                          *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_12.cpp b/exprtk/exprtk_simple_example_12.cpp
index d1adb77..9297224 100644
--- a/exprtk/exprtk_simple_example_12.cpp
+++ b/exprtk/exprtk_simple_example_12.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 12                                          *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_13.cpp b/exprtk/exprtk_simple_example_13.cpp
index 2e8cb32..b865406 100644
--- a/exprtk/exprtk_simple_example_13.cpp
+++ b/exprtk/exprtk_simple_example_13.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 13                                          *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
@@ -28,8 +28,8 @@ template <typename T>
 void savitzky_golay_filter()
 {
    typedef exprtk::symbol_table<T> symbol_table_t;
-   typedef exprtk::expression<T>     expression_t;
-   typedef exprtk::parser<T>             parser_t;
+   typedef exprtk::expression<T>   expression_t;
+   typedef exprtk::parser<T>       parser_t;
 
    const std::string sgfilter_program =
                   " var weight[9] :=                                          "
@@ -69,15 +69,15 @@ void savitzky_golay_filter()
    // Generate a signal with noise.
    for (T t = T(-5); t <= T(+5); t += T(10.0 / n))
    {
-      T noise = T(0.5 * (rand() / (RAND_MAX + 1.0) - 0.5));
+      const T noise = T(0.5 * (rand() / (RAND_MAX + 1.0) - 0.5));
       v_in.push_back(sin(2.0 * pi * t) + noise);
    }
 
    v_out.resize(v_in.size());
 
    symbol_table_t symbol_table;
-   symbol_table.add_vector("v_in" , v_in);
-   symbol_table.add_vector("v_out",v_out);
+   symbol_table.add_vector("v_in" , v_in );
+   symbol_table.add_vector("v_out", v_out);
 
    expression_t expression;
    expression.register_symbol_table(symbol_table);
diff --git a/exprtk/exprtk_simple_example_14.cpp b/exprtk/exprtk_simple_example_14.cpp
index 5ff9d79..887ce57 100644
--- a/exprtk/exprtk_simple_example_14.cpp
+++ b/exprtk/exprtk_simple_example_14.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 14                                          *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_15.cpp b/exprtk/exprtk_simple_example_15.cpp
index 852a643..011514a 100644
--- a/exprtk/exprtk_simple_example_15.cpp
+++ b/exprtk/exprtk_simple_example_15.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 15                                          *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_16.cpp b/exprtk/exprtk_simple_example_16.cpp
index 06ee39c..e7e8ef4 100644
--- a/exprtk/exprtk_simple_example_16.cpp
+++ b/exprtk/exprtk_simple_example_16.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 16                                          *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_17.cpp b/exprtk/exprtk_simple_example_17.cpp
index d141204..9345eeb 100644
--- a/exprtk/exprtk_simple_example_17.cpp
+++ b/exprtk/exprtk_simple_example_17.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 17                                          *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_18.cpp b/exprtk/exprtk_simple_example_18.cpp
index 84f4575..de8ee31 100644
--- a/exprtk/exprtk_simple_example_18.cpp
+++ b/exprtk/exprtk_simple_example_18.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 18                                          *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_simple_example_19.cpp b/exprtk/exprtk_simple_example_19.cpp
index 753022f..8401582 100644
--- a/exprtk/exprtk_simple_example_19.cpp
+++ b/exprtk/exprtk_simple_example_19.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Simple Example 19                                          *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *
diff --git a/exprtk/exprtk_test.cpp b/exprtk/exprtk_test.cpp
index 9e62b10..1aa78ad 100644
--- a/exprtk/exprtk_test.cpp
+++ b/exprtk/exprtk_test.cpp
@@ -3,7 +3,7 @@
  *         C++ Mathematical Expression Toolkit Library        *
  *                                                            *
  * Examples and Unit-Tests                                    *
- * Author: Arash Partow (1999-2021)                           *
+ * Author: Arash Partow (1999-2022)                           *
  * URL: http://www.partow.net/programming/exprtk/index.html   *
  *                                                            *
  * Copyright notice:                                          *