diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96a8256..900b367 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Split CMakeLists.txt files between library and executable
 - Add C++ wrapper functions
+- Change license year to 2022
 
 ## v2.0.0
 
diff --git a/LICENSE b/LICENSE
index aa60317..5625f63 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Tilen MAJERLE
+Copyright (c) 2022 Tilen MAJERLE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/dev/lwmem_opts.h b/dev/lwmem_opts.h
index a03fa48..91db702 100644
--- a/dev/lwmem_opts.h
+++ b/dev/lwmem_opts.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/dev/main.cpp b/dev/main.cpp
index bddf070..5356162 100644
--- a/dev/main.cpp
+++ b/dev/main.cpp
@@ -7,19 +7,17 @@
 extern "C" void lwmem_test_run(void);
 extern "C" void lwmem_test_memory_structure(void);
 
+/* Setup manager */
 Lwmem::LwmemLight<1024> manager;
 
 int
 main(void) {
-    //lwmem_test_memory_structure();
+    lwmem_test_memory_structure();
     //lwmem_test_run();
 
+    /* Test C++ code */
     void* ret = manager.malloc(123);
-
     std::cout << ret << std::endl;
-
-    /* blablablabla */
-
     manager.free(ret);
 
     return 0;
diff --git a/examples/stm32/lwmem_rtos_stm32l496_discovery/inc/lwmem_opts.h b/examples/stm32/lwmem_rtos_stm32l496_discovery/inc/lwmem_opts.h
index 0f929f3..c3c6151 100644
--- a/examples/stm32/lwmem_rtos_stm32l496_discovery/inc/lwmem_opts.h
+++ b/examples/stm32/lwmem_rtos_stm32l496_discovery/inc/lwmem_opts.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/examples/stm32/lwmem_rtos_stm32l496_discovery/inc/main.h b/examples/stm32/lwmem_rtos_stm32l496_discovery/inc/main.h
index 4bff3ec..a798edf 100644
--- a/examples/stm32/lwmem_rtos_stm32l496_discovery/inc/main.h
+++ b/examples/stm32/lwmem_rtos_stm32l496_discovery/inc/main.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/examples/stm32/lwmem_rtos_stm32l496_discovery/src/main.c b/examples/stm32/lwmem_rtos_stm32l496_discovery/src/main.c
index e36eb21..45f1412 100644
--- a/examples/stm32/lwmem_rtos_stm32l496_discovery/src/main.c
+++ b/examples/stm32/lwmem_rtos_stm32l496_discovery/src/main.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/examples/stm32/lwmem_stm32l496_discovery/inc/lwmem_opts.h b/examples/stm32/lwmem_stm32l496_discovery/inc/lwmem_opts.h
index 1f94312..1c9c2d1 100644
--- a/examples/stm32/lwmem_stm32l496_discovery/inc/lwmem_opts.h
+++ b/examples/stm32/lwmem_stm32l496_discovery/inc/lwmem_opts.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/examples/stm32/lwmem_stm32l496_discovery/inc/main.h b/examples/stm32/lwmem_stm32l496_discovery/inc/main.h
index 4bff3ec..a798edf 100644
--- a/examples/stm32/lwmem_stm32l496_discovery/inc/main.h
+++ b/examples/stm32/lwmem_stm32l496_discovery/inc/main.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/examples/stm32/lwmem_stm32l496_discovery/src/main.c b/examples/stm32/lwmem_stm32l496_discovery/src/main.c
index 0c47d50..8592189 100644
--- a/examples/stm32/lwmem_stm32l496_discovery/src/main.c
+++ b/examples/stm32/lwmem_stm32l496_discovery/src/main.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/examples/win32/lwmem/lwmem_opts.h b/examples/win32/lwmem/lwmem_opts.h
index 1f94312..1c9c2d1 100644
--- a/examples/win32/lwmem/lwmem_opts.h
+++ b/examples/win32/lwmem/lwmem_opts.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/examples/win32/lwmem_multi_ins_multi_region/lwmem_opts.h b/examples/win32/lwmem_multi_ins_multi_region/lwmem_opts.h
index 1f94312..1c9c2d1 100644
--- a/examples/win32/lwmem_multi_ins_multi_region/lwmem_opts.h
+++ b/examples/win32/lwmem_multi_ins_multi_region/lwmem_opts.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/examples/win32/lwmem_multi_region/lwmem_opts.h b/examples/win32/lwmem_multi_region/lwmem_opts.h
index 1f94312..1c9c2d1 100644
--- a/examples/win32/lwmem_multi_region/lwmem_opts.h
+++ b/examples/win32/lwmem_multi_region/lwmem_opts.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/examples/win32/lwmem_os/lwmem_opts.h b/examples/win32/lwmem_os/lwmem_opts.h
index 8536f88..a5dcb36 100644
--- a/examples/win32/lwmem_os/lwmem_opts.h
+++ b/examples/win32/lwmem_os/lwmem_opts.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/lwmem/src/include/lwmem/lwmem.h b/lwmem/src/include/lwmem/lwmem.h
index 90c579a..8784a26 100644
--- a/lwmem/src/include/lwmem/lwmem.h
+++ b/lwmem/src/include/lwmem/lwmem.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/lwmem/src/include/lwmem/lwmem_opt.h b/lwmem/src/include/lwmem/lwmem_opt.h
index 8050d88..ae7864b 100644
--- a/lwmem/src/include/lwmem/lwmem_opt.h
+++ b/lwmem/src/include/lwmem/lwmem_opt.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/lwmem/src/include/lwmem/lwmem_opts_template.h b/lwmem/src/include/lwmem/lwmem_opts_template.h
index ccac00c..1b54393 100644
--- a/lwmem/src/include/lwmem/lwmem_opts_template.h
+++ b/lwmem/src/include/lwmem/lwmem_opts_template.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/lwmem/src/include/system/lwmem_sys.h b/lwmem/src/include/system/lwmem_sys.h
index 9afb1e0..44bdfb1 100644
--- a/lwmem/src/include/system/lwmem_sys.h
+++ b/lwmem/src/include/system/lwmem_sys.h
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/lwmem/src/lwmem/lwmem.c b/lwmem/src/lwmem/lwmem.c
index a3b798d..e0cce7a 100644
--- a/lwmem/src/lwmem/lwmem.c
+++ b/lwmem/src/lwmem/lwmem.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/lwmem/src/system/lwmem_sys_cmsis_os.c b/lwmem/src/system/lwmem_sys_cmsis_os.c
index 17bf646..c720cc2 100644
--- a/lwmem/src/system/lwmem_sys_cmsis_os.c
+++ b/lwmem/src/system/lwmem_sys_cmsis_os.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/lwmem/src/system/lwmem_sys_threadx.c b/lwmem/src/system/lwmem_sys_threadx.c
index 0aa2cd0..db8fa51 100644
--- a/lwmem/src/system/lwmem_sys_threadx.c
+++ b/lwmem/src/system/lwmem_sys_threadx.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation
diff --git a/lwmem/src/system/lwmem_sys_win32.c b/lwmem/src/system/lwmem_sys_win32.c
index 5fdb647..449fecf 100644
--- a/lwmem/src/system/lwmem_sys_win32.c
+++ b/lwmem/src/system/lwmem_sys_win32.c
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (c) 2020 Tilen MAJERLE
+ * Copyright (c) 2022 Tilen MAJERLE
  *
  * Permission is hereby granted, free of charge, to any person
  * obtaining a copy of this software and associated documentation