From 8618e39486dde855d671e1e7ecc3f50b43aee257 Mon Sep 17 00:00:00 2001
From: ThePhD <phdofthehouse@gmail.com>
Date: Sat, 6 Mar 2021 01:03:23 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=20Prepare=20for=20the=20a=20sol4?=
 =?UTF-8?q?=20release...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 🎨 Refactor the CMake a whle bunch
---
 .clang-format                                 |    2 +-
 .dockerignore                                 |    2 +-
 .gitignore                                    |    2 +-
 .travis.yml                                   |    2 +-
 CMakeLists.txt                                |   22 +-
 LICENSE.txt                                   |    2 +-
 appveyor.yml                                  |    2 +-
 cmake/Modules/Common/Core.cmake               |    2 +-
 cmake/Modules/FindCatch.cmake                 |   84 -
 cmake/Modules/FindKaguyaBuild.cmake           |    2 +-
 cmake/Modules/FindLua/set_version_vars.cmake  |    2 +-
 cmake/Modules/FindLuaBridgeBuild.cmake        |    2 +-
 cmake/Modules/FindLuaBuild.cmake              |    2 +-
 cmake/Modules/FindLuaBuild/LuaJIT.cmake       |    8 +-
 cmake/Modules/FindLuaBuild/LuaVanilla.cmake   |   16 +-
 cmake/Modules/FindLuwraBuild.cmake            |    2 +-
 cmake/Modules/FindSphinx.cmake                |   68 +
 cmake/Modules/FindToLuappBuild.cmake          |    7 +-
 cmake/sol2-config.cmake.in                    |    2 +-
 docs/CMakeLists.txt                           |   46 -
 documentation/.clang-format                   |  110 +
 documentation/CMakeLists.txt                  |  104 +
 documentation/Doxyfile.in                     | 2678 +++++++++++++++++
 {docs => documentation}/Makefile              |    0
 {docs => documentation}/make.bat              |    0
 ...4 - ThePhD - No Overhead C Abstraction.pdf |  Bin
 ...11.08 - ThePhD - Wrapping Lua C in C++.pdf |  Bin
 ....06 - ThePhD - Biting the CMake Bullet.pdf |  Bin
 ...ompile Fast, Run Faster, Scale Forever.pdf |  Bin
 ...hD - Scripting at the Speed of Thought.pdf |  Bin
 ...- Compile-Time Extension Points in C++.pdf |  Bin
 documentation/requirements.txt                |    3 +
 .../source/_themes/sol2/layout.html           |    0
 .../_themes/sol2/static/search-fix.js_t       |    0
 .../source/_themes/sol2/static/sol2.css_t     |    0
 .../source/_themes/sol2/theme.conf            |    0
 .../source/api/api-top.rst                    |    0
 .../source/api/as_args.rst                    |    0
 .../source/api/as_container.rst               |    0
 .../source/api/as_function.rst                |    0
 .../source/api/as_returns.rst                 |    0
 .../source/api/as_table.rst                   |    0
 {docs => documentation}/source/api/c_call.rst |    0
 .../source/api/compatibility.rst              |    0
 .../source/api/coroutine.rst                  |    0
 .../source/api/environment.rst                |    0
 {docs => documentation}/source/api/error.rst  |    0
 .../source/api/function.rst                   |    0
 .../source/api/lua_value.rst                  |    0
 .../source/api/make_reference.rst             |    0
 .../source/api/metatable_key.rst              |    0
 {docs => documentation}/source/api/nested.rst |    0
 .../source/api/new_table.rst                  |    0
 {docs => documentation}/source/api/object.rst |    0
 .../source/api/optional.rst                   |    0
 .../source/api/overload.rst                   |    0
 .../source/api/policies.rst                   |    0
 .../source/api/property.rst                   |    0
 .../source/api/protect.rst                    |    0
 .../source/api/protected_function.rst         |    3 +-
 {docs => documentation}/source/api/proxy.rst  |    0
 .../source/api/readonly.rst                   |    0
 .../source/api/reference.rst                  |    0
 .../source/api/resolve.rst                    |    0
 {docs => documentation}/source/api/stack.rst  |    0
 .../source/api/stack_reference.rst            |    2 +-
 {docs => documentation}/source/api/state.rst  |    0
 {docs => documentation}/source/api/table.rst  |    0
 .../source/api/table_traversal_keys.rst       |    0
 .../source/api/this_environment.rst           |    0
 .../source/api/this_state.rst                 |    0
 {docs => documentation}/source/api/thread.rst |    0
 {docs => documentation}/source/api/tie.rst    |    0
 {docs => documentation}/source/api/types.rst  |    0
 .../source/api/unique_usertype_traits.rst     |    0
 {docs => documentation}/source/api/user.rst   |    0
 .../source/api/userdata.rst                   |    0
 .../source/api/usertype.rst                   |    0
 .../source/api/usertype_memory.rst            |    0
 {docs => documentation}/source/api/var.rst    |    0
 .../source/api/variadic_args.rst              |    0
 .../source/api/variadic_results.rst           |    0
 .../source/api/yielding.rst                   |    0
 {docs => documentation}/source/benchmarks.rst |    0
 {docs => documentation}/source/build.rst      |    0
 {docs => documentation}/source/codecvt.rst    |    0
 .../source/compilation.rst                    |    0
 {docs => documentation}/source/conf.py        |   91 +-
 {docs => documentation}/source/containers.rst |    0
 {docs => documentation}/source/errors.rst     |    0
 {docs => documentation}/source/exceptions.rst |    0
 {docs => documentation}/source/features.rst   |    2 +-
 {docs => documentation}/source/functions.rst  |    0
 {docs => documentation}/source/index.rst      |    0
 {docs => documentation}/source/licenses.rst   |    0
 .../source/media/Ko-fi_Blue.png               |  Bin
 .../source/media/become_a_patron_button.png   |  Bin
 .../source/media/bench/base_derived.png       |  Bin
 .../source/media/bench/c_function.png         |  Bin
 .../bench/c_function_through_lua_in_c.png     |  Bin
 .../media/bench/implicit_inheritance.png      |  Bin
 .../media/bench/lua_bindings_shootout.json    |    0
 .../source/media/bench/lua_function_in_c.png  |  Bin
 .../media/bench/member_function_call.png      |  Bin
 .../source/media/bench/multi_return.png       |  Bin
 .../source/media/bench/multi_return_lua.png   |  Bin
 .../source/media/bench/optional_failure.png   |  Bin
 .../media/bench/optional_half_failure.png     |  Bin
 .../source/media/bench/optional_success.png   |  Bin
 .../source/media/bench/return_userdata.png    |  Bin
 .../media/bench/stateful_function_object.png  |  Bin
 .../source/media/bench/table_chained_get.png  |  Bin
 .../source/media/bench/table_chained_set.png  |  Bin
 .../source/media/bench/table_get.png          |  Bin
 .../media/bench/table_global_string_get.png   |  Bin
 .../media/bench/table_global_string_set.png   |  Bin
 .../source/media/bench/table_set.png          |  Bin
 .../media/bench/userdata_variable_access.png  |  Bin
 .../bench/userdata_variable_access_large.png  |  Bin
 .../bench/userdata_variable_access_last.png   |  Bin
 .../source/media/discord_logo_wordmark.png    |  Bin
 .../source/media/eevee_code_after.jpg         |  Bin
 .../source/media/eevee_code_before.jpg        |  Bin
 .../source/media/github_logo.png              |  Bin
 .../source/media/github_sponsors_logo.png     |  Bin
 .../source/media/liberapay_logo.png           |  Bin
 .../source/media/pp_cc_mark_111x69.jpg        |  Bin
 {docs => documentation}/source/media/sol.png  |  Bin
 {docs => documentation}/source/media/sol.psd  |  Bin
 {docs => documentation}/source/mentions.rst   |    0
 {docs => documentation}/source/origin.rst     |    0
 .../source/performance.rst                    |    0
 {docs => documentation}/source/rtti.rst       |    0
 {docs => documentation}/source/safety.rst     |    0
 {docs => documentation}/source/threading.rst  |    0
 {docs => documentation}/source/traits.rst     |    0
 .../source/tutorial/all-the-things.rst        |    2 +-
 .../source/tutorial/customization.rst         |    0
 .../source/tutorial/cxx-in-lua.rst            |    0
 .../source/tutorial/existing.rst              |    0
 .../source/tutorial/functions.rst             |  174 +-
 .../source/tutorial/getting-started.rst       |    0
 .../source/tutorial/ownership.rst             |    0
 .../source/tutorial/tutorial-top.rst          |    0
 .../source/tutorial/variables.rst             |    0
 {docs => documentation}/source/usertypes.rst  |    0
 examples/CMakeLists.txt                       |   51 +-
 examples/customization/CMakeLists.txt         |    6 +-
 .../customization/source/lua_zm_interop.cpp   |    2 +-
 examples/customization/source/main.cpp        |    2 +-
 examples/include/assert.hpp                   |   41 -
 examples/interop/LuaBridge/CMakeLists.txt     |   12 +-
 .../interop/LuaBridge/source/LuaBridge.cpp    |   43 +-
 examples/interop/kaguya/CMakeLists.txt        |   12 +-
 examples/interop/kaguya/source/kaguya.cpp     |   11 +-
 examples/interop/luwra/CMakeLists.txt         |   12 +-
 examples/interop/luwra/source/luwra.cpp       |   30 +-
 examples/interop/tolua/CMakeLists.txt         |   14 +-
 examples/interop/tolua/source/tolua.cpp       |   30 +-
 examples/require_dll_example/CMakeLists.txt   |   26 +-
 .../include/my_object/my_object.hpp           |    9 +-
 .../include/my_object/my_object_api.hpp       |   28 +-
 .../require_dll_example/source/my_object.cpp  |    6 +-
 .../source/require_from_dll.cpp               |    5 +-
 examples/source/any_return.cpp                |    9 +-
 examples/source/args_from_container.cpp       |    8 +-
 examples/source/as_returns.cpp                |   15 +-
 examples/source/basic.cpp                     |   13 +-
 examples/source/c_array.cpp                   |   20 +-
 examples/source/c_call.cpp                    |   21 +-
 examples/source/config.cpp                    |   23 +-
 .../container_usertype_as_container.cpp       |   50 +-
 examples/source/container_with_pairs.cpp      |    5 +-
 examples/source/containers.cpp                |    8 +-
 examples/source/containers_as_table.cpp       |   21 +-
 examples/source/coroutine.cpp                 |   14 +-
 examples/source/coroutine_multiple_stacks.cpp |   10 +-
 examples/source/coroutine_state.cpp           |    3 +-
 examples/source/custom_reader.cpp             |   24 +-
 .../source/customization_convert_on_get.cpp   |   12 +-
 ...tomization_global_transparent_argument.cpp |    4 +-
 examples/source/customization_multiple.cpp    |    5 +-
 examples/source/docs/as_function.cpp          |    8 +-
 .../as_function_usertype_member_variable.cpp  |   15 +-
 examples/source/docs/as_table_ipairs.cpp      |    6 +-
 examples/source/docs/inheritance.cpp          |   28 +-
 examples/source/docs/my_panic.cpp             |    4 +-
 .../source/docs/preparing_environments.cpp    |    8 +-
 .../source/docs/references_in_lambdas.cpp     |   13 +-
 examples/source/docs/runtime_extension.cpp    |   10 +-
 examples/source/docs/simple_functions.cpp     |    7 +-
 examples/source/docs/simple_structs.cpp       |   22 +-
 examples/source/docs/state_script_safe.cpp    |    8 +-
 examples/source/docs/state_transfer.cpp       |   11 +-
 examples/source/dump.cpp                      |    7 +-
 examples/source/dynamic_object.cpp            |    3 +-
 examples/source/environment_snooping.cpp      |    7 +-
 examples/source/environment_state.cpp         |    6 +-
 examples/source/environment_state_2.cpp       |    2 +-
 examples/source/environments_on_functions.cpp |   58 +-
 examples/source/exception_handler.cpp         |    3 +-
 examples/source/functions.cpp                 |   23 +-
 examples/source/functions_empty_arguments.cpp |    1 -
 .../source/index_and_newindex_usertype.cpp    |   27 +-
 examples/source/indirect_function_calls.cpp   |    7 +-
 examples/source/lua_value.cpp                 |    9 +-
 examples/source/metatable_key_low_level.cpp   |   15 +-
 examples/source/multi_results.cpp             |   29 +-
 examples/source/optional_with_iteration.cpp   |   12 +-
 examples/source/overloading.cpp               |    7 +-
 examples/source/overloading_with_fallback.cpp |   12 +-
 examples/source/overloading_with_members.cpp  |   38 +-
 .../source/overridable_function_members.cpp   |    5 +-
 examples/source/pairs.cpp                     |   21 +-
 examples/source/pairs_with_raw_functions.cpp  |   14 +-
 examples/source/property.cpp                  |   13 +-
 examples/source/protect.cpp                   |    7 +-
 examples/source/protected_functions.cpp       |    2 +-
 examples/source/read_only.cpp                 |   50 +-
 examples/source/require.cpp                   |   11 +-
 examples/source/require_override_behavior.cpp |   15 +-
 examples/source/runtime_additions.cpp         |    9 +-
 examples/source/script_error_handling.cpp     |    9 +-
 examples/source/self_from_lua.cpp             |    5 +-
 examples/source/shared_ptr.cpp                |   25 +-
 examples/source/shared_ptr_inheritance.cpp    |    5 +-
 .../source/shared_ptr_modify_in_place.cpp     |   16 +-
 examples/source/singleton.cpp                 |   15 +-
 examples/source/stack_aligned_function.cpp    |    7 +-
 .../stack_aligned_stack_handler_function.cpp  |    7 +-
 examples/source/static_variables.cpp          |   17 +-
 examples/source/table_as_container.cpp        |    9 +-
 examples/source/table_create_if_nil.cpp       |    5 +-
 examples/source/table_proxy.cpp               |    5 +-
 examples/source/tables.cpp                    |   23 +-
 examples/source/this_state.cpp                |   17 +-
 examples/source/tie.cpp                       |   19 +-
 examples/source/tutorials/multiple_return.cpp |   22 +
 examples/source/tutorials/object_lifetime.cpp |    2 +-
 .../quick_n_dirty/arguments_to_scripts.cpp    |    5 +-
 .../tutorials/quick_n_dirty/functions_all.cpp |    7 +-
 .../quick_n_dirty/functions_easy.cpp          |   11 +-
 .../tutorials/quick_n_dirty/make_tables.cpp   |   20 +-
 .../multiple_returns_from_lua.cpp             |    9 +-
 .../quick_n_dirty/multiple_returns_to_lua.cpp |   13 +-
 .../tutorials/quick_n_dirty/namespacing.cpp   |   13 +-
 .../quick_n_dirty/opening_a_state.cpp         |    1 -
 .../quick_n_dirty/running_lua_code.cpp        |   15 +-
 .../running_lua_code_low_level.cpp            |   13 +-
 .../quick_n_dirty/running_lua_code_safely.cpp |   19 +-
 .../quick_n_dirty/set_and_get_variables.cpp   |   21 +-
 .../set_and_get_variables_exists.cpp          |    5 +-
 .../quick_n_dirty/tables_and_nesting.cpp      |   17 +-
 .../tutorials/quick_n_dirty/userdata.cpp      |   28 +-
 .../userdata_memory_reference.cpp             |   20 +-
 .../tutorials/quick_n_dirty/usertypes.cpp     |   14 +-
 .../source/tutorials/reading_functions.cpp    |   29 +
 examples/source/tutorials/variables_demo.cpp  |   13 +-
 .../source/tutorials/write_variables_demo.cpp |    9 +-
 .../source/tutorials/writing_functions.cpp    |   28 +
 .../tutorials/writing_member_functions.cpp    |   50 +
 .../writing_overloaded_template_functions.cpp |   24 +
 .../tutorials/writing_template_functions.cpp  |   28 +
 examples/source/unique_ptr.cpp                |   23 +-
 examples/source/usertype.cpp                  |  158 +-
 examples/source/usertype_advanced.cpp         |   20 +-
 .../source/usertype_automatic_operators.cpp   |   18 +-
 examples/source/usertype_basics.cpp           |   35 +-
 examples/source/usertype_bitfields.cpp        |   29 +-
 examples/source/usertype_call_from_c++.cpp    |   20 +-
 examples/source/usertype_dynamic_get_set.cpp  |   37 +-
 examples/source/usertype_initializers.cpp     |   27 +-
 .../source/usertype_special_functions.cpp     |   36 +-
 examples/source/usertype_var.cpp              |   21 +-
 examples/source/variables.cpp                 |   44 +-
 examples/source/variadic_args_shifted.cpp     |   10 +-
 examples/source/variadic_args_storage.cpp     |   10 +-
 examples/source/wip/lua_inheritance.cpp       |    3 +-
 include/sol/as_args.hpp                       |    2 +-
 include/sol/as_returns.hpp                    |    2 +-
 include/sol/assert.hpp                        |   99 +
 include/sol/base_traits.hpp                   |    2 +-
 include/sol/bind_traits.hpp                   |    2 +-
 include/sol/bytecode.hpp                      |    2 +-
 include/sol/call.hpp                          |    4 +-
 include/sol/compatibility.hpp                 |    2 +-
 include/sol/compatibility/lua_version.hpp     |    2 +-
 include/sol/config.hpp                        |    2 +-
 include/sol/coroutine.hpp                     |    2 +-
 include/sol/debug.hpp                         |    2 +-
 include/sol/demangle.hpp                      |    2 +-
 include/sol/deprecate.hpp                     |    2 +-
 include/sol/dump_handler.hpp                  |    2 +-
 include/sol/ebco.hpp                          |   12 +-
 include/sol/environment.hpp                   |    6 +-
 include/sol/error.hpp                         |    2 +-
 include/sol/error_handler.hpp                 |    2 +-
 include/sol/forward.hpp                       |    2 +-
 include/sol/forward_detail.hpp                |    2 +-
 include/sol/function.hpp                      |    2 +-
 include/sol/function_result.hpp               |    2 +-
 include/sol/function_types.hpp                |    2 +-
 include/sol/function_types_core.hpp           |    2 +-
 include/sol/function_types_overloaded.hpp     |    2 +-
 include/sol/function_types_stateful.hpp       |    2 +-
 include/sol/function_types_stateless.hpp      |    2 +-
 include/sol/function_types_templated.hpp      |    2 +-
 include/sol/in_place.hpp                      |    2 +-
 include/sol/inheritance.hpp                   |    2 +-
 include/sol/load_result.hpp                   |    2 +-
 include/sol/lua_table.hpp                     |    2 +-
 include/sol/lua_value.hpp                     |    2 +-
 include/sol/make_reference.hpp                |    2 +-
 include/sol/metatable.hpp                     |    2 +-
 include/sol/object.hpp                        |    2 +-
 include/sol/object_base.hpp                   |    2 +-
 include/sol/optional.hpp                      |    2 +-
 include/sol/optional_implementation.hpp       |    5 +-
 include/sol/overload.hpp                      |    2 +-
 include/sol/packaged_coroutine.hpp            |    2 +-
 include/sol/pairs_iterator.hpp                |    2 +-
 include/sol/pointer_like.hpp                  |    2 +-
 include/sol/policies.hpp                      |    2 +-
 include/sol/property.hpp                      |    2 +-
 include/sol/protect.hpp                       |    2 +-
 include/sol/protected_function.hpp            |    2 +-
 include/sol/protected_function_result.hpp     |    2 +-
 include/sol/protected_handler.hpp             |    2 +-
 include/sol/proxy_base.hpp                    |    2 +-
 include/sol/raii.hpp                          |    2 +-
 include/sol/reference.hpp                     |    2 +-
 include/sol/resolve.hpp                       |    6 +-
 include/sol/sol.hpp                           |    3 +-
 include/sol/stack.hpp                         |   14 +-
 include/sol/stack_check.hpp                   |    2 +-
 include/sol/stack_check_get.hpp               |    2 +-
 include/sol/stack_check_get_qualified.hpp     |    2 +-
 include/sol/stack_check_get_unqualified.hpp   |    2 +-
 include/sol/stack_check_qualified.hpp         |    2 +-
 include/sol/stack_check_unqualified.hpp       |    2 +-
 include/sol/stack_core.hpp                    |    2 +-
 include/sol/stack_field.hpp                   |    2 +-
 include/sol/stack_get.hpp                     |    2 +-
 include/sol/stack_get_qualified.hpp           |    2 +-
 include/sol/stack_get_unqualified.hpp         |    2 +-
 include/sol/stack_guard.hpp                   |    2 +-
 include/sol/stack_iterator.hpp                |    2 +-
 include/sol/stack_pop.hpp                     |    2 +-
 include/sol/stack_probe.hpp                   |    2 +-
 include/sol/stack_proxy.hpp                   |    2 +-
 include/sol/stack_proxy_base.hpp              |    2 +-
 include/sol/stack_push.hpp                    |    2 +-
 include/sol/stack_reference.hpp               |    2 +-
 include/sol/state.hpp                         |    2 +-
 include/sol/state_handling.hpp                |    2 +-
 include/sol/state_view.hpp                    |    2 +-
 include/sol/string_view.hpp                   |    2 +-
 include/sol/table.hpp                         |    2 +-
 include/sol/table_core.hpp                    |    2 +-
 include/sol/table_iterator.hpp                |    2 +-
 include/sol/table_proxy.hpp                   |    2 +-
 include/sol/thread.hpp                        |    2 +-
 include/sol/tie.hpp                           |    2 +-
 include/sol/traits.hpp                        |    2 +-
 include/sol/trampoline.hpp                    |    2 +-
 include/sol/tuple.hpp                         |    2 +-
 include/sol/types.hpp                         |    2 +-
 include/sol/unicode.hpp                       |    6 +-
 include/sol/unique_usertype_traits.hpp        |    8 +-
 include/sol/unsafe_function.hpp               |    2 +-
 include/sol/unsafe_function_result.hpp        |    2 +-
 include/sol/userdata.hpp                      |    2 +-
 include/sol/usertype.hpp                      |    2 +-
 include/sol/usertype_container.hpp            |    2 +-
 include/sol/usertype_container_launch.hpp     |    2 +-
 include/sol/usertype_core.hpp                 |    2 +-
 include/sol/usertype_proxy.hpp                |    2 +-
 include/sol/usertype_storage.hpp              |    2 +-
 include/sol/usertype_traits.hpp               |    2 +-
 include/sol/variadic_args.hpp                 |    2 +-
 include/sol/variadic_results.hpp              |    2 +-
 include/sol/version.hpp                       |   24 +-
 include/sol/wrapper.hpp                       |    2 +-
 scripts/build.linux.sh                        |    2 +-
 scripts/preparation.linux.sh                  |    2 +-
 scripts/preparation.osx.sh                    |    2 +-
 scripts/push.linux.sh                         |    2 +-
 scripts/run.linux.sh                          |    2 +-
 scripts/run.osx.sh                            |    2 +-
 single/include/sol/config.hpp                 |    4 +-
 single/include/sol/forward.hpp                |   26 +-
 single/include/sol/sol.hpp                    |  135 +-
 sol2.natvis                                   |    8 +-
 tests/CMakeLists.txt                          |   10 +-
 tests/config_tests/CMakeLists.txt             |    2 +-
 .../function_pointers/CMakeLists.txt          |   13 +-
 .../function_pointers/source/main.cpp         |   13 +-
 tests/header_tests/CMakeLists.txt             |   14 +-
 tests/header_tests/source/as_args.cpp         |    2 +-
 tests/header_tests/source/as_returns.cpp      |    2 +-
 tests/header_tests/source/base_traits.cpp     |    2 +-
 tests/header_tests/source/bind_traits.cpp     |    2 +-
 tests/header_tests/source/bytecode.cpp        |    2 +-
 tests/header_tests/source/call.cpp            |    2 +-
 tests/header_tests/source/compatibility.cpp   |    2 +-
 .../source/compatibility/compat-5.3.cpp       |    2 +-
 .../source/compatibility/lua_version.cpp      |    2 +-
 tests/header_tests/source/config.cpp          |    2 +-
 tests/header_tests/source/coroutine.cpp       |    2 +-
 tests/header_tests/source/debug.cpp           |    2 +-
 tests/header_tests/source/demangle.cpp        |    2 +-
 tests/header_tests/source/deprecate.cpp       |    2 +-
 tests/header_tests/source/ebco.cpp            |    2 +-
 tests/header_tests/source/environment.cpp     |    2 +-
 tests/header_tests/source/error_handler.cpp   |    2 +-
 tests/header_tests/source/forward.cpp         |    2 +-
 tests/header_tests/source/forward_detail.cpp  |    2 +-
 tests/header_tests/source/function.cpp        |    2 +-
 tests/header_tests/source/function_result.cpp |    2 +-
 tests/header_tests/source/function_types.cpp  |    2 +-
 .../source/function_types_core.cpp            |    2 +-
 .../source/function_types_overloaded.cpp      |    2 +-
 .../source/function_types_stateful.cpp        |    2 +-
 .../source/function_types_stateless.cpp       |    2 +-
 .../source/function_types_templated.cpp       |    2 +-
 tests/header_tests/source/in_place.cpp        |    2 +-
 tests/header_tests/source/inheritance.cpp     |    2 +-
 tests/header_tests/source/load_result.cpp     |    2 +-
 tests/header_tests/source/lua_table.cpp       |    2 +-
 tests/header_tests/source/lua_value.cpp       |    2 +-
 tests/header_tests/source/main.cpp            |    4 +-
 tests/header_tests/source/make_reference.cpp  |    2 +-
 tests/header_tests/source/metatable.cpp       |    2 +-
 tests/header_tests/source/object.cpp          |    2 +-
 tests/header_tests/source/object_base.cpp     |    2 +-
 tests/header_tests/source/optional.cpp        |    2 +-
 .../source/optional_implementation.cpp        |    2 +-
 tests/header_tests/source/overload.cpp        |    2 +-
 .../source/packaged_coroutine.cpp             |    2 +-
 tests/header_tests/source/pairs_iterator.cpp  |    2 +-
 tests/header_tests/source/pointer_like.cpp    |    2 +-
 tests/header_tests/source/policies.cpp        |    2 +-
 tests/header_tests/source/property.cpp        |    2 +-
 tests/header_tests/source/protect.cpp         |    2 +-
 .../source/protected_function.cpp             |    2 +-
 .../source/protected_function_result.cpp      |    2 +-
 .../header_tests/source/protected_handler.cpp |    2 +-
 tests/header_tests/source/proxy.cpp           |    2 +-
 tests/header_tests/source/proxy_base.cpp      |    2 +-
 tests/header_tests/source/raii.cpp            |    2 +-
 tests/header_tests/source/reference.cpp       |    2 +-
 tests/header_tests/source/resolve.cpp         |    2 +-
 tests/header_tests/source/sol.cpp             |    2 +-
 tests/header_tests/source/sol_defines.hpp     |    2 +-
 tests/header_tests/source/stack.cpp           |    2 +-
 tests/header_tests/source/stack_check.cpp     |    2 +-
 tests/header_tests/source/stack_check_get.cpp |    2 +-
 .../source/stack_check_get_qualified.cpp      |    2 +-
 .../source/stack_check_get_unqualified.cpp    |    2 +-
 .../source/stack_check_qualified.cpp          |    2 +-
 .../source/stack_check_unqualified.cpp        |    2 +-
 tests/header_tests/source/stack_core.cpp      |    2 +-
 tests/header_tests/source/stack_field.cpp     |    2 +-
 tests/header_tests/source/stack_get.cpp       |    2 +-
 .../source/stack_get_qualified.cpp            |    2 +-
 .../source/stack_get_unqualified.cpp          |    2 +-
 tests/header_tests/source/stack_guard.cpp     |    2 +-
 tests/header_tests/source/stack_iterator.cpp  |    2 +-
 tests/header_tests/source/stack_pop.cpp       |    2 +-
 tests/header_tests/source/stack_probe.cpp     |    2 +-
 tests/header_tests/source/stack_proxy.cpp     |    2 +-
 .../header_tests/source/stack_proxy_base.cpp  |    2 +-
 tests/header_tests/source/stack_push.cpp      |    2 +-
 tests/header_tests/source/stack_reference.cpp |    2 +-
 tests/header_tests/source/state_handling.cpp  |    2 +-
 tests/header_tests/source/string_view.cpp     |    2 +-
 tests/header_tests/source/table.cpp           |    2 +-
 tests/header_tests/source/table_core.cpp      |    2 +-
 tests/header_tests/source/table_iterator.cpp  |    2 +-
 tests/header_tests/source/thread.cpp          |    2 +-
 tests/header_tests/source/tie.cpp             |    2 +-
 tests/header_tests/source/traits.cpp          |    2 +-
 tests/header_tests/source/trampoline.cpp      |    2 +-
 tests/header_tests/source/tuple.cpp           |    2 +-
 tests/header_tests/source/types.cpp           |    2 +-
 tests/header_tests/source/unicode.cpp         |    2 +-
 .../source/unique_usertype_traits.cpp         |    2 +-
 tests/header_tests/source/unsafe_function.cpp |    2 +-
 .../source/unsafe_function_result.cpp         |    2 +-
 tests/header_tests/source/userdata.cpp        |    2 +-
 tests/header_tests/source/usertype.cpp        |    2 +-
 .../source/usertype_container.cpp             |    2 +-
 .../source/usertype_container_launch.cpp      |    2 +-
 tests/header_tests/source/usertype_core.cpp   |    2 +-
 tests/header_tests/source/usertype_proxy.cpp  |    2 +-
 .../header_tests/source/usertype_storage.cpp  |    2 +-
 tests/header_tests/source/usertype_traits.cpp |    2 +-
 tests/header_tests/source/variadic_args.cpp   |    2 +-
 .../header_tests/source/variadic_results.cpp  |    2 +-
 tests/header_tests/source/version.cpp         |    2 +-
 tests/header_tests/source/wrapper.cpp         |    2 +-
 tests/regression_tests/1011/CMakeLists.txt    |   13 +-
 tests/regression_tests/CMakeLists.txt         |    2 +-
 tests/regression_tests/simple/CMakeLists.txt  |   13 +-
 tests/runtime_tests/CMakeLists.txt            |   25 +-
 tests/runtime_tests/source/basic.cpp          |    4 +-
 tests/runtime_tests/source/common_classes.hpp |    4 +-
 .../source/container.usertype_check.cpp       |    4 +-
 .../source/container_semantics.cpp            |    4 +-
 .../source/container_semantics.custom.cpp     |    4 +-
 .../source/container_semantics.ordered.cpp    |   18 +-
 .../source/container_semantics.unordered.cpp  |   16 +-
 .../runtime_tests/source/container_shims.cpp  |    4 +-
 .../runtime_tests/source/container_table.cpp  |    4 +-
 tests/runtime_tests/source/containers.cpp     |    4 +-
 .../source/containers.roundtrip.cpp           |   24 +-
 .../runtime_tests/source/containers.table.cpp |   25 +-
 tests/runtime_tests/source/coroutines.cpp     |    4 +-
 tests/runtime_tests/source/customizations.cpp |    4 +-
 .../source/customizations_private.cpp         |   18 +-
 tests/runtime_tests/source/dump.cpp           |    4 +-
 tests/runtime_tests/source/environments.cpp   |    4 +-
 tests/runtime_tests/source/functions.cpp      |    4 +-
 tests/runtime_tests/source/functions.std.cpp  |    4 +-
 tests/runtime_tests/source/gc.cpp             |    4 +-
 tests/runtime_tests/source/large_integer.cpp  |    4 +-
 tests/runtime_tests/source/lua_value.cpp      |    4 +-
 tests/runtime_tests/source/main.cpp           |    2 +-
 tests/runtime_tests/source/operators.cpp      |    4 +-
 tests/runtime_tests/source/overflow.cpp       |    6 +-
 tests/runtime_tests/source/plain_types.cpp    |    4 +-
 tests/runtime_tests/source/policies.cpp       |    4 +-
 tests/runtime_tests/source/proxies.cpp        |   10 +-
 tests/runtime_tests/source/sol_test.hpp       |    2 +-
 tests/runtime_tests/source/state.cpp          |    4 +-
 tests/runtime_tests/source/storage.cpp        |    6 +-
 tests/runtime_tests/source/strings.cpp        |    4 +-
 tests/runtime_tests/source/tables.checks.cpp  |   10 +-
 tests/runtime_tests/source/tables.clear.cpp   |    4 +-
 tests/runtime_tests/source/tables.cpp         |    9 +-
 tests/runtime_tests/source/tables.enums.cpp   |   21 +-
 .../runtime_tests/source/tables.indexing.cpp  |    5 +-
 .../runtime_tests/source/tables.insertion.cpp |    4 +-
 .../runtime_tests/source/tables.traversal.cpp |    4 +-
 .../source/usertypes.auxiliary_keys.cpp       |    4 +-
 .../runtime_tests/source/usertypes.basic.cpp  |    8 +-
 .../source/usertypes.constructors.cpp         |    4 +-
 tests/runtime_tests/source/usertypes.cpp      |    4 +-
 .../source/usertypes.inheritance.cpp          |   51 +-
 .../source/usertypes.inheritance.multi.cpp    |    4 +-
 .../source/usertypes.member_variables.cpp     |    4 +-
 .../source/usertypes.overload.cpp             |    4 +-
 .../source/usertypes.properties.cpp           |    4 +-
 .../source/usertypes.runtime.cpp              |    4 +-
 .../runtime_tests/source/usertypes.unique.cpp |    4 +-
 .../source/usertypes.unregister.cpp           |    4 +-
 tests/runtime_tests/source/utility.cpp        |    6 +-
 tests/runtime_tests/source/variadics.cpp      |    4 +-
 558 files changed, 4991 insertions(+), 1978 deletions(-)
 delete mode 100644 cmake/Modules/FindCatch.cmake
 create mode 100644 cmake/Modules/FindSphinx.cmake
 delete mode 100644 docs/CMakeLists.txt
 create mode 100644 documentation/.clang-format
 create mode 100644 documentation/CMakeLists.txt
 create mode 100644 documentation/Doxyfile.in
 rename {docs => documentation}/Makefile (100%)
 rename {docs => documentation}/make.bat (100%)
 rename {docs => documentation}/presentations/2016.10.14 - ThePhD - No Overhead C Abstraction.pdf (100%)
 rename {docs => documentation}/presentations/2017.11.08 - ThePhD - Wrapping Lua C in C++.pdf (100%)
 rename {docs => documentation}/presentations/2018.02.06 - ThePhD - Biting the CMake Bullet.pdf (100%)
 rename {docs => documentation}/presentations/2018.05.10 - ThePhD - Compile Fast, Run Faster, Scale Forever.pdf (100%)
 rename {docs => documentation}/presentations/2018.09.28 - ThePhD - Scripting at the Speed of Thought.pdf (100%)
 rename {docs => documentation}/presentations/2019.05.10 - ThePhD - The Plan for Tomorrow - Compile-Time Extension Points in C++.pdf (100%)
 create mode 100644 documentation/requirements.txt
 rename {docs => documentation}/source/_themes/sol2/layout.html (100%)
 rename {docs => documentation}/source/_themes/sol2/static/search-fix.js_t (100%)
 rename {docs => documentation}/source/_themes/sol2/static/sol2.css_t (100%)
 rename {docs => documentation}/source/_themes/sol2/theme.conf (100%)
 rename {docs => documentation}/source/api/api-top.rst (100%)
 rename {docs => documentation}/source/api/as_args.rst (100%)
 rename {docs => documentation}/source/api/as_container.rst (100%)
 rename {docs => documentation}/source/api/as_function.rst (100%)
 rename {docs => documentation}/source/api/as_returns.rst (100%)
 rename {docs => documentation}/source/api/as_table.rst (100%)
 rename {docs => documentation}/source/api/c_call.rst (100%)
 rename {docs => documentation}/source/api/compatibility.rst (100%)
 rename {docs => documentation}/source/api/coroutine.rst (100%)
 rename {docs => documentation}/source/api/environment.rst (100%)
 rename {docs => documentation}/source/api/error.rst (100%)
 rename {docs => documentation}/source/api/function.rst (100%)
 rename {docs => documentation}/source/api/lua_value.rst (100%)
 rename {docs => documentation}/source/api/make_reference.rst (100%)
 rename {docs => documentation}/source/api/metatable_key.rst (100%)
 rename {docs => documentation}/source/api/nested.rst (100%)
 rename {docs => documentation}/source/api/new_table.rst (100%)
 rename {docs => documentation}/source/api/object.rst (100%)
 rename {docs => documentation}/source/api/optional.rst (100%)
 rename {docs => documentation}/source/api/overload.rst (100%)
 rename {docs => documentation}/source/api/policies.rst (100%)
 rename {docs => documentation}/source/api/property.rst (100%)
 rename {docs => documentation}/source/api/protect.rst (100%)
 rename {docs => documentation}/source/api/protected_function.rst (98%)
 rename {docs => documentation}/source/api/proxy.rst (100%)
 rename {docs => documentation}/source/api/readonly.rst (100%)
 rename {docs => documentation}/source/api/reference.rst (100%)
 rename {docs => documentation}/source/api/resolve.rst (100%)
 rename {docs => documentation}/source/api/stack.rst (100%)
 rename {docs => documentation}/source/api/stack_reference.rst (82%)
 rename {docs => documentation}/source/api/state.rst (100%)
 rename {docs => documentation}/source/api/table.rst (100%)
 rename {docs => documentation}/source/api/table_traversal_keys.rst (100%)
 rename {docs => documentation}/source/api/this_environment.rst (100%)
 rename {docs => documentation}/source/api/this_state.rst (100%)
 rename {docs => documentation}/source/api/thread.rst (100%)
 rename {docs => documentation}/source/api/tie.rst (100%)
 rename {docs => documentation}/source/api/types.rst (100%)
 rename {docs => documentation}/source/api/unique_usertype_traits.rst (100%)
 rename {docs => documentation}/source/api/user.rst (100%)
 rename {docs => documentation}/source/api/userdata.rst (100%)
 rename {docs => documentation}/source/api/usertype.rst (100%)
 rename {docs => documentation}/source/api/usertype_memory.rst (100%)
 rename {docs => documentation}/source/api/var.rst (100%)
 rename {docs => documentation}/source/api/variadic_args.rst (100%)
 rename {docs => documentation}/source/api/variadic_results.rst (100%)
 rename {docs => documentation}/source/api/yielding.rst (100%)
 rename {docs => documentation}/source/benchmarks.rst (100%)
 rename {docs => documentation}/source/build.rst (100%)
 rename {docs => documentation}/source/codecvt.rst (100%)
 rename {docs => documentation}/source/compilation.rst (100%)
 rename {docs => documentation}/source/conf.py (81%)
 rename {docs => documentation}/source/containers.rst (100%)
 rename {docs => documentation}/source/errors.rst (100%)
 rename {docs => documentation}/source/exceptions.rst (100%)
 rename {docs => documentation}/source/features.rst (99%)
 rename {docs => documentation}/source/functions.rst (100%)
 rename {docs => documentation}/source/index.rst (100%)
 rename {docs => documentation}/source/licenses.rst (100%)
 rename {docs => documentation}/source/media/Ko-fi_Blue.png (100%)
 rename {docs => documentation}/source/media/become_a_patron_button.png (100%)
 rename {docs => documentation}/source/media/bench/base_derived.png (100%)
 rename {docs => documentation}/source/media/bench/c_function.png (100%)
 rename {docs => documentation}/source/media/bench/c_function_through_lua_in_c.png (100%)
 rename {docs => documentation}/source/media/bench/implicit_inheritance.png (100%)
 rename {docs => documentation}/source/media/bench/lua_bindings_shootout.json (100%)
 rename {docs => documentation}/source/media/bench/lua_function_in_c.png (100%)
 rename {docs => documentation}/source/media/bench/member_function_call.png (100%)
 rename {docs => documentation}/source/media/bench/multi_return.png (100%)
 rename {docs => documentation}/source/media/bench/multi_return_lua.png (100%)
 rename {docs => documentation}/source/media/bench/optional_failure.png (100%)
 rename {docs => documentation}/source/media/bench/optional_half_failure.png (100%)
 rename {docs => documentation}/source/media/bench/optional_success.png (100%)
 rename {docs => documentation}/source/media/bench/return_userdata.png (100%)
 rename {docs => documentation}/source/media/bench/stateful_function_object.png (100%)
 rename {docs => documentation}/source/media/bench/table_chained_get.png (100%)
 rename {docs => documentation}/source/media/bench/table_chained_set.png (100%)
 rename {docs => documentation}/source/media/bench/table_get.png (100%)
 rename {docs => documentation}/source/media/bench/table_global_string_get.png (100%)
 rename {docs => documentation}/source/media/bench/table_global_string_set.png (100%)
 rename {docs => documentation}/source/media/bench/table_set.png (100%)
 rename {docs => documentation}/source/media/bench/userdata_variable_access.png (100%)
 rename {docs => documentation}/source/media/bench/userdata_variable_access_large.png (100%)
 rename {docs => documentation}/source/media/bench/userdata_variable_access_last.png (100%)
 rename {docs => documentation}/source/media/discord_logo_wordmark.png (100%)
 rename {docs => documentation}/source/media/eevee_code_after.jpg (100%)
 rename {docs => documentation}/source/media/eevee_code_before.jpg (100%)
 rename {docs => documentation}/source/media/github_logo.png (100%)
 rename {docs => documentation}/source/media/github_sponsors_logo.png (100%)
 rename {docs => documentation}/source/media/liberapay_logo.png (100%)
 rename {docs => documentation}/source/media/pp_cc_mark_111x69.jpg (100%)
 rename {docs => documentation}/source/media/sol.png (100%)
 rename {docs => documentation}/source/media/sol.psd (100%)
 rename {docs => documentation}/source/mentions.rst (100%)
 rename {docs => documentation}/source/origin.rst (100%)
 rename {docs => documentation}/source/performance.rst (100%)
 rename {docs => documentation}/source/rtti.rst (100%)
 rename {docs => documentation}/source/safety.rst (100%)
 rename {docs => documentation}/source/threading.rst (100%)
 rename {docs => documentation}/source/traits.rst (100%)
 rename {docs => documentation}/source/tutorial/all-the-things.rst (99%)
 rename {docs => documentation}/source/tutorial/customization.rst (100%)
 rename {docs => documentation}/source/tutorial/cxx-in-lua.rst (100%)
 rename {docs => documentation}/source/tutorial/existing.rst (100%)
 rename {docs => documentation}/source/tutorial/functions.rst (62%)
 rename {docs => documentation}/source/tutorial/getting-started.rst (100%)
 rename {docs => documentation}/source/tutorial/ownership.rst (100%)
 rename {docs => documentation}/source/tutorial/tutorial-top.rst (100%)
 rename {docs => documentation}/source/tutorial/variables.rst (100%)
 rename {docs => documentation}/source/usertypes.rst (100%)
 delete mode 100644 examples/include/assert.hpp
 create mode 100644 examples/source/tutorials/multiple_return.cpp
 create mode 100644 examples/source/tutorials/reading_functions.cpp
 create mode 100644 examples/source/tutorials/writing_functions.cpp
 create mode 100644 examples/source/tutorials/writing_member_functions.cpp
 create mode 100644 examples/source/tutorials/writing_overloaded_template_functions.cpp
 create mode 100644 examples/source/tutorials/writing_template_functions.cpp
 create mode 100644 include/sol/assert.hpp

diff --git a/.clang-format b/.clang-format
index 3b5097fc..00287c34 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/.dockerignore b/.dockerignore
index 575447fa..66da40ea 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/.gitignore b/.gitignore
index f48ba75e..62319697 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/.travis.yml b/.travis.yml
index 1e72a32e..0859e587 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21f3fb6c..07a5dc7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -22,10 +22,10 @@
 
 # # # # sol3
 # # # Required minimum version statement
-cmake_minimum_required(VERSION 3.5.0)
+cmake_minimum_required(VERSION 3.15.0)
 
 # # # project declaration
-project(sol2 VERSION 3.2.3 LANGUAGES CXX C)
+project(sol2 VERSION 3.2.5 LANGUAGES CXX C)
 
 include(GNUInstallDirs)
 
@@ -36,13 +36,15 @@ include(GNUInstallDirs)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" "${CMAKE_MODULE_PATH}")
 
 # Include standard modules
-include(CMakeDependentOption)
 include(CMakePackageConfigHelpers)
-
+include(CheckCXXCompilerFlag)
+include(CMakeDependentOption)
+include(GNUInstallDirs)
+include(FetchContent)
 
 # # # Configuration
 # # Cached defines, strings, paths and options
-set(SOL2_LUA_VERSION "5.3.5" CACHE STRING "The version of Lua needed. Can be 5.1, 5.2, 5.3, 5.4, LuaJIT, or a more specific 3-part version number for a specifc Lua (e.g., 5.3.4 or luajit-2.0.5)")
+set(SOL2_LUA_VERSION "5.3.5" CACHE STRING "The version of Lua needed. Can be 5.1, 5.2, 5.3, 5.4, LuaJIT, or a more specific 3-part version number for a specifc Lua (e.g., 5.3.5 or luajit-2.0.5)")
 set(SOL2_BUILD_LUA TRUE CACHE BOOL "Always build Lua, do not search for it in the system")
 set(SOL2_PLATFORM "x64" CACHE STRING "Target platform to compile for when building binaries (x86, x64)")
 option(SOL2_CI "Whether or not we are in continguous integration mode" OFF)
@@ -161,7 +163,7 @@ endif()
 # Generates the docs
 if (SOL2_DOCS)
 	message(STATUS "sol2 adding docs...")
-	add_subdirectory(docs)
+	add_subdirectory(documentation)
 endif()
 
 if(SOL2_ENABLE_INSTALL)
@@ -277,13 +279,9 @@ if (SOL2_IS_TOP_LEVEL AND (SOL2_DO_TESTS OR SOL2_DO_EXAMPLES))
 		set_target_properties(${lualib}
 			PROPERTIES 
 			INTERFACE_INCLUDE_DIRECTORIES ${LUA_INCLUDE_DIR}
-			INTERFACE_LINK_LIBRARIES ${LUA_SEARCH_DEPENDENCY_LIBS}
+			INTERFACE_LINK_LIBRARIES ${LUA_SEARCH_DEPENDENCY_LIBS} ${CMAKE_DL_LIBS}
 			IMPORTED_LINK_INTERFACE_LANGUAGES C
 			IMPORTED_LOCATION ${lualiblocation})
-		if (CMAKE_DL_LIBS)
-			set_property(TARGET ${lualib}
-				APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS})
-		endif()
 		set(LUA_LIBRARIES ${lualib})
 	endif()
 
diff --git a/LICENSE.txt b/LICENSE.txt
index 6cfdd03b..633ce75b 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/appveyor.yml b/appveyor.yml
index 9087cb2b..b852b6b0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/cmake/Modules/Common/Core.cmake b/cmake/Modules/Common/Core.cmake
index ab7d5119..7bead144 100644
--- a/cmake/Modules/Common/Core.cmake
+++ b/cmake/Modules/Common/Core.cmake
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/cmake/Modules/FindCatch.cmake b/cmake/Modules/FindCatch.cmake
deleted file mode 100644
index 4d227439..00000000
--- a/cmake/Modules/FindCatch.cmake
+++ /dev/null
@@ -1,84 +0,0 @@
-# # # # sol3
-# The MIT License (MIT)
-#
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-include(ExternalProject)
-include(FindPackageHandleStandardArgs)
-include(Common/Core)
-
-# # Base variables
-if (Catch_FIND_VERSION)
-	set(catch_version ${Catch_FIND_VERSION})
-else()
-	set(catch_version 2.11.1)
-endif()
-
-set(catch_lib catch_lib_${catch_version})
-
-# # Useful locations
-set(catch_build_toplevel "${CMAKE_BINARY_DIR}/vendor/catch_${catch_version}")
-set(catch_include_dirs "${catch_build_toplevel}")
-
-# # catch library sources
-set(catch_sources catch.hpp)
-prepend(catch_sources "${catch_build_toplevel}/" ${catch_sources})
-
-# # !! CMake 3.5 does not have DOWNLOAD_NO_EXTRACT e.e
-# # Now I know why people don't like CMake that much: the earlier versions were kind of garbage
-# # External project to get sources
-#ExternalProject_Add(CATCH_BUILD_SOURCE
-#	BUILD_IN_SOURCE TRUE
-#	BUILD_ALWAYS FALSE
-#	DOWNLOAD_NO_EXTRACT TRUE
-#	URL https://github.com/catchorg/Catch2/releases/download/v${catch_version}/catch.hpp
-#	TLS_VERIFY TRUE
-#	PREFIX ${catch_build_toplevel}
-#	SOURCE_DIR ${catch_build_toplevel}
-#	DOWNLOAD_DIR ${catch_build_toplevel}
-#	TMP_DIR "${catch_build_toplevel}-tmp"
-#	STAMP_DIR "${catch_build_toplevel}-stamp"
-#	INSTALL_DIR "${catch_build_toplevel}/local"
-#	CONFIGURE_COMMAND ""
-#	BUILD_COMMAND ""
-#	INSTALL_COMMAND ""
-#	TEST_COMMAND ""
-#	BUILD_BYPRODUCTS "${catch_sources}")
-
-file(MAKE_DIRECTORY "${catch_build_toplevel}")
-file(DOWNLOAD https://github.com/catchorg/Catch2/releases/download/v${catch_version}/catch.hpp ${catch_sources})
-
-add_library(${catch_lib} INTERFACE)
-# add_dependencies(${catch_lib} CATCH_BUILD_SOURCE)
-target_include_directories(${catch_lib} INTERFACE ${catch_include_dirs})
-
-if (MSVC)
-	target_compile_definitions(${catch_lib} INTERFACE
-		_SILENCE_CXX17_UNCAUGHT_EXCEPTION_DEPRECATION_WARNING)
-endif()
-
-set(CATCH_FOUND TRUE)
-set(CATCH_LIBRARIES ${catch_lib})
-set(CATCH_INCLUDE_DIRS ${catch_include_dirs})
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Catch
-	FOUND_VAR CATCH_FOUND
-	REQUIRED_VARS CATCH_LIBRARIES CATCH_INCLUDE_DIRS
-	VERSION_VAR catch_version)
diff --git a/cmake/Modules/FindKaguyaBuild.cmake b/cmake/Modules/FindKaguyaBuild.cmake
index 6d2e0410..bcf10cae 100644
--- a/cmake/Modules/FindKaguyaBuild.cmake
+++ b/cmake/Modules/FindKaguyaBuild.cmake
@@ -2,7 +2,7 @@
 # # # # sol3
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/cmake/Modules/FindLua/set_version_vars.cmake b/cmake/Modules/FindLua/set_version_vars.cmake
index d42194f7..0907212f 100644
--- a/cmake/Modules/FindLua/set_version_vars.cmake
+++ b/cmake/Modules/FindLua/set_version_vars.cmake
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/cmake/Modules/FindLuaBridgeBuild.cmake b/cmake/Modules/FindLuaBridgeBuild.cmake
index ae7e7acd..10d155e5 100644
--- a/cmake/Modules/FindLuaBridgeBuild.cmake
+++ b/cmake/Modules/FindLuaBridgeBuild.cmake
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/cmake/Modules/FindLuaBuild.cmake b/cmake/Modules/FindLuaBuild.cmake
index 0e2d6579..353a4c7b 100644
--- a/cmake/Modules/FindLuaBuild.cmake
+++ b/cmake/Modules/FindLuaBuild.cmake
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/cmake/Modules/FindLuaBuild/LuaJIT.cmake b/cmake/Modules/FindLuaBuild/LuaJIT.cmake
index 24812740..80598b80 100644
--- a/cmake/Modules/FindLuaBuild/LuaJIT.cmake
+++ b/cmake/Modules/FindLuaBuild/LuaJIT.cmake
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -415,6 +415,8 @@ add_library(${lualib} INTERFACE)
 add_dependencies(${lualib} LUA_JIT-move)
 target_include_directories(${lualib}
 	INTERFACE "${LUA_JIT_SOURCE_DIR}")
+target_link_libraries(${lualib}
+		INTERFACE ${CMAKE_DL_LIBS})
 if (BUILD_LUA_AS_DLL)
 	if (MSVC)
 		target_link_libraries(${lualib}
@@ -428,10 +430,6 @@ else()
 		INTERFACE "${LUA_JIT_DESTINATION_LUA_LIB}")
 endif()
 
-if (CMAKE_DL_LIBS)
-	target_link_libraries(${lualib}
-		INTERFACE ${CMAKE_DL_LIBS})
-endif()
 if (XCODE)
 	target_compile_options(${lualib}
 		INTERFACE -pagezero_size 10000 -image_base 100000000)
diff --git a/cmake/Modules/FindLuaBuild/LuaVanilla.cmake b/cmake/Modules/FindLuaBuild/LuaVanilla.cmake
index 131c12ed..8ba8be52 100644
--- a/cmake/Modules/FindLuaBuild/LuaVanilla.cmake
+++ b/cmake/Modules/FindLuaBuild/LuaVanilla.cmake
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -360,9 +360,7 @@ endif()
 target_compile_options(${liblua}
 	PRIVATE ${LUA_VANILLA_LUALIB_COMPILER_OPTIONS})
 add_dependencies(${liblua} LUA_VANILLA)
-if (CMAKE_DL_LIBS)
-	target_link_libraries(${liblua} PRIVATE ${CMAKE_DL_LIBS})
-endif()
+target_link_libraries(${liblua} PRIVATE ${CMAKE_DL_LIBS})
 if (UNIX)
 	target_link_libraries(${liblua} PRIVATE m)
 endif()
@@ -399,10 +397,7 @@ if (LUA_BUILD_LUA_INTERPRETER)
 		target_compile_definitions(${luainterpreter} 
 			PRIVATE LUA_USE_LINUX)
 	endif()
-	target_link_libraries(${luainterpreter} PRIVATE ${liblua})
-	if (CMAKE_DL_LIBS)
-		target_link_libraries(${luainterpreter} PRIVATE ${CMAKE_DL_LIBS})
-	endif()
+	target_link_libraries(${luainterpreter} PRIVATE ${liblua} ${CMAKE_DL_LIBS})
 	if (UNIX)
 		target_link_libraries(${luainterpreter} PRIVATE m readline)
 	endif()
@@ -437,10 +432,7 @@ if (LUA_BUILD_LUA_COMPILER)
 		target_compile_definitions(${luacompiler} 
 			PRIVATE LUA_USE_LINUX)
 	endif()
-	target_link_libraries(${luacompiler} PRIVATE ${liblua})
-	if (CMAKE_DL_LIBS)
-		target_link_libraries(${luacompiler} PRIVATE ${CMAKE_DL_LIBS})
-	endif()
+	target_link_libraries(${luacompiler} PRIVATE ${liblua} ${CMAKE_DL_LIBS})
 	if (UNIX)
 		# TODO: make readline optional?
 		target_link_libraries(${luacompiler} PRIVATE m readline)
diff --git a/cmake/Modules/FindLuwraBuild.cmake b/cmake/Modules/FindLuwraBuild.cmake
index c0bd2773..6bb64149 100644
--- a/cmake/Modules/FindLuwraBuild.cmake
+++ b/cmake/Modules/FindLuwraBuild.cmake
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/cmake/Modules/FindSphinx.cmake b/cmake/Modules/FindSphinx.cmake
new file mode 100644
index 00000000..6d3ae928
--- /dev/null
+++ b/cmake/Modules/FindSphinx.cmake
@@ -0,0 +1,68 @@
+# # # # sol3
+# The MIT License (MIT)
+#
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+include(FindPackageHandleStandardArgs)
+include(FeatureSummary)
+
+find_program(Sphinx_Build_EXECUTABLE NAMES sphinx-build DOC "Path to sphinx-build executable")
+
+if (Sphinx_Build_EXECUTABLE)
+  set(Sphinx_Build_FOUND YES)
+endif()
+
+if (Sphinx_Build_FOUND)
+  execute_process(
+    COMMAND ${Sphinx_Build_EXECUTABLE} --version
+    OUTPUT_VARIABLE Sphinx_Build_VERSION_OUTPUT
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ENCODING UTF-8)
+  if (Sphinx_Build_VERSION_OUTPUT)
+    string(REGEX
+      MATCH "[^0-9]*([0-9]+)[.]([0-9]+)?[.]?([0-9]+)?[.]?([0-9]+)?.*"
+      Sphinx_Build_VERSION_CHECK ${Sphinx_Build_VERSION_OUTPUT})
+  endif()
+  if (Sphinx_Build_VERSION_CHECK)
+    string(JOIN "." Sphinx_Build_VERSION
+      ${CMAKE_MATCH_1}
+      ${CMAKE_MATCH_2}
+      ${CMAKE_MATCH_3}
+      ${CMAKE_MATCH_4})
+    set(Sphinx_Build_VERSION "${Sphinx_Build_VERSION}" CACHE STRING "sphinx-build version" FORCE)
+  endif()
+endif()
+
+find_package_handle_standard_args(Sphinx
+  REQUIRED_VARS Sphinx_Build_EXECUTABLE
+  VERSION_VAR Sphinx_Build_VERSION
+  HANDLE_COMPONENTS)
+
+set_package_properties(Sphinx
+  PROPERTIES
+    DESCRIPTION "Sphinx Documentation Generator"
+    URL "https://sphinx-doc.org")
+
+if (Sphinx_Build_FOUND AND NOT TARGET Sphinx::Build)
+  add_executable(Sphinx::Build IMPORTED)
+  set_property(TARGET Sphinx::Build PROPERTY IMPORTED_LOCATION ${Sphinx_Build_EXECUTABLE})
+  set_property(TARGET Sphinx::Build PROPERTY VERSION ${Sphinx_Build_VERSION})
+  mark_as_advanced(Sphinx_Build_EXECUTABLE Sphinx_Build_VERSION)
+endif()
\ No newline at end of file
diff --git a/cmake/Modules/FindToLuappBuild.cmake b/cmake/Modules/FindToLuappBuild.cmake
index d1ba7d83..fc6a8b7f 100644
--- a/cmake/Modules/FindToLuappBuild.cmake
+++ b/cmake/Modules/FindToLuappBuild.cmake
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -65,7 +65,7 @@ set_target_properties(${toluapp_lib} PROPERTIES
 	POSITION_INDEPENDENT_CODE TRUE)
 target_include_directories(${toluapp_lib}
 	PUBLIC ${toluapp_include_dirs})
-target_link_libraries(${toluapp_lib} PRIVATE ${LUA_LIBRARIES})
+target_link_libraries(${toluapp_lib} PRIVATE ${LUA_LIBRARIES} ${CMAKE_DL_LIBS})
 if (MSVC)
 	target_compile_options(${toluapp_lib}
 		PRIVATE /W1)
@@ -77,9 +77,6 @@ else()
 		INTERFACE -Wno-noexcept-type
 		PUBLIC -Wno-ignored-qualifiers -Wno-unused-parameter)
 endif()
-if (CMAKE_DL_LIBS)
-	target_link_libraries(${toluapp_lib} PRIVATE ${CMAKE_DL_LIBS})
-endif()
 # add compatibility define
 target_compile_definitions(${toluapp_lib}
 		PRIVATE COMPAT53_PREFIX=toluapp_compat53)
diff --git a/cmake/sol2-config.cmake.in b/cmake/sol2-config.cmake.in
index ab5a5fc1..e36f3c5b 100644
--- a/cmake/sol2-config.cmake.in
+++ b/cmake/sol2-config.cmake.in
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
deleted file mode 100644
index 2ebb85cf..00000000
--- a/docs/CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-# # # # sol3
-# The MIT License (MIT)
-# 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# # # # sol3, documentation generation
-# # # Required minimum version statement
-cmake_minimum_required(VERSION 3.5.0)
-	
-find_package(Python3 COMPONENTS Interpreter)
-
-if (NOT Python3_FOUND AND NOT Python3_Interpreter_FOUND)
-	message(FATAL_ERROR "sol2 documentation cannot be generated as python 3 has not been found: install or set the python 3 interpreter for the docs to find it and be sure to pip install sphinx")
-endif()
-
-find_program(sol2_make_executable make make.exe mingw32-make mingw32-make.exe)
-if(NOT sol2_make_executable)
-	message(FATAL_ERROR "could not find a suitable make executable to build Sphinx documentation")
-endif()
-
-add_custom_command(OUTPUT docs_invisible_file_always_generate
-	USES_TERMINAL
-	COMMAND "${sol2_make_executable}" -C "${CMAKE_CURRENT_SOURCE_DIR}" html "BUILDDIR=${CMAKE_CURRENT_BINARY_DIR}")
-add_custom_target(docs 
-	DEPENDS docs_invisible_file_always_generate)
-
-if(SOL2_ENABLE_INSTALL)
-	install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/docs/html" DESTINATION "${CMAKE_INSTALL_DOCDIR}")
-endif()
diff --git a/documentation/.clang-format b/documentation/.clang-format
new file mode 100644
index 00000000..991a73da
--- /dev/null
+++ b/documentation/.clang-format
@@ -0,0 +1,110 @@
+# # # # sol3
+# The MIT License (MIT)
+# 
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+BasedOnStyle: WebKit
+IndentWidth: 5
+TabWidth: 5
+ContinuationIndentWidth: 5
+UseTab: ForIndentation
+
+# Namespaces
+NamespaceIndentation: All
+CompactNamespaces: true
+FixNamespaceComments: true
+
+# Overall Alignment
+ColumnLimit: 75
+AlignAfterOpenBracket: DontAlign # uses ContinuationIndentWidth for this instead
+AccessModifierOffset: -5 # do not push public: or private: around
+#AlignConsecutiveAssignments: true # affects more than what's expected: do not use
+#AlignConsecutiveDeclarations: true # affects more than what's expected: do not use
+
+# Type Alignment
+DerivePointerAlignment: false
+PointerAlignment: Left
+AlwaysBreakTemplateDeclarations: true
+AlwaysBreakBeforeMultilineStrings: true
+
+# Comments
+AlignTrailingComments: true
+ReflowComments: true
+
+# Macros
+AlignEscapedNewlines: Left
+#IndentPPDirectives: None
+
+# Functions
+AllowShortFunctionsOnASingleLine: None
+AlwaysBreakAfterReturnType: None
+BreakConstructorInitializers: BeforeComma
+ConstructorInitializerIndentWidth: 0
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+BinPackArguments: false
+BinPackParameters: true
+
+# Classes
+BreakBeforeInheritanceComma: false
+
+# Braces
+Cpp11BracedListStyle: false
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterEnum: false
+  AfterStruct: false
+  AfterControlStatement: false
+  AfterClass: false
+  AfterNamespace: false
+  AfterStruct: false
+  AfterUnion: false
+  BeforeElse: true
+  BeforeCatch: true
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: true
+
+# Control Statements
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+IndentCaseLabels: false
+
+# Spaces
+SpaceAfterCStyleCast: false
+SpacesInCStyleCastParentheses: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesInAngles: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+MaxEmptyLinesToKeep: 3
+
+# OCD
+SortUsingDeclarations: true
+SortIncludes: false
+
+---
+Language: Cpp
+Standard: Cpp11
diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
new file mode 100644
index 00000000..91230e37
--- /dev/null
+++ b/documentation/CMakeLists.txt
@@ -0,0 +1,104 @@
+# # # # sol3
+# The MIT License (MIT)
+# 
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# # # # sol3, documentation generation
+# # # Required minimum version statement
+cmake_minimum_required(VERSION 3.15.0)
+	
+find_package(Doxygen REQUIRED)
+find_package(Python3 REQUIRED)
+find_package(Sphinx REQUIRED)
+
+# Find all the public headers
+file(GLOB_RECURSE sol2_public_headers
+  LIST_DIRECTORIES NO
+  CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/include/**.*)
+# make a list copy for use with dependency tracking later down below
+set(sol2_doxygen_public_headers ${sol2_public_headers})
+# Remove every single public header
+list(FILTER sol2_doxygen_public_headers EXCLUDE REGEX /detail/.*)
+# separate text with spaces and surround them with quotes for Doxygen to understand them all
+list(TRANSFORM sol2_doxygen_public_headers REPLACE "(.+)" [["\1"]])
+list(JOIN sol2_doxygen_public_headers " " sol2_doxygen_public_headers)
+
+set(SOL2_DOXYGEN_PROJECT_DESCRIPTION ${PROJECT_DESCRIPTION})
+set(SOL2_DOXYGEN_PROJECT_VERSION ${PROJECT_VERSION})
+set(SOL2_DOXYGEN_PROJECT_NAME ${PROJECT_NAME})
+set(SOL2_DOXYGEN_INPUT ${sol2_doxygen_public_headers})
+set(SOL2_DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/doxygen)
+set(SOL2_DOXYGEN_XML_OUTPUT_DIR ${SOL2_DOXYGEN_OUTPUT_DIR}/xml)
+set(SOL2_DOXYGEN_HTML_OUTPUT_DIR ${SOL2_DOXYGEN_OUTPUT_DIR}/html)
+set(SOL2_DOXYGEN_INDEX_FILE ${SOL2_DOXYGEN_XML_OUTPUT_DIR}/index.xml)
+set(SOL2_DOXYFILE_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
+set(SOL2_DOXYFILE_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+set(SOL2_SPHINX_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/source)
+set(SOL2_SPHINX_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/sphinx)
+
+# Get all Sphinx source files
+file(GLOB_RECURSE sol2_sphinx_sources
+  LIST_DIRECTORIES NO
+  CONFIGURE_DEPENDS ${SOL2_SPHINX_SOURCE_DIR}/**.*)
+
+#Replace variables inside @@ with the current values
+configure_file(${SOL2_DOXYFILE_IN} ${SOL2_DOXYFILE_OUT} @ONLY)
+
+# Ensure Doxygen/Sphinx won't crash because it doesn't create directories for us
+file(MAKE_DIRECTORY ${SOL2_DOXYGEN_OUTPUT_DIR})
+file(MAKE_DIRECTORY ${SOL2_DOXYGEN_XML_OUTPUT_DIR})
+file(MAKE_DIRECTORY ${SOL2_DOXYGEN_HTML_OUTPUT_DIR})
+file(MAKE_DIRECTORY ${SOL2_SPHINX_BUILD_DIR})
+
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES
+  ${SOL2_DOXYGEN_XML_OUTPUT_DIR}
+  ${SOL2_DOXYGEN_HTML_OUTPUT_DIR}
+  ${SOL2_DOXYGEN_OUTPUT_DIR}
+  ${SOL2_SPHINX_BUILD_DIR})
+
+add_custom_command(OUTPUT ${SOL2_DOXYGEN_INDEX_FILE}
+	COMMAND ${DOXYGEN_EXECUTABLE} ${SOL2_DOXYFILE_OUT}
+	MAIN_DEPENDENCY ${SOL2_DOXYFILE_IN} ${SOL2_DOXYFILE_OUT}
+	DEPENDS ${sol2_public_headers}
+	COMMENT "[sol2/documentation] Generating Doxygen XML..."
+)
+add_custom_target(sol2.documentation.doxygen ALL DEPENDS ${SOL2_DOXYGEN_INDEX_FILE})
+
+if (NOT SOL2_DOCUMENTATION_NO_SPHINX)
+	add_custom_target(sol2.documentation.sphinx ALL
+    COMMAND Sphinx::Build
+      -b html
+      -Dbreathe_projects.sol2=${SOL2_DOXYGEN_XML_OUTPUT_DIR}
+      ${SOL2_SPHINX_SOURCE_DIR}
+      ${SOL2_SPHINX_BUILD_DIR}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ${SOL2_DOXYGEN_INDEX_FILE} ${sol2_sphinx_sources}
+    COMMENT "[sol2/documentation] Generating Sphinx documentation..."
+    COMMAND_EXPAND_LISTS
+    VERBATIM)
+
+	add_dependencies(sol2.documentation.sphinx sol2.documentation.doxygen)
+endif()
+
+# For the install target
+include(GNUInstallDirs)
+install(DIRECTORY ${SOL2_SPHINX_BUILD_DIR}
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}
+)
\ No newline at end of file
diff --git a/documentation/Doxyfile.in b/documentation/Doxyfile.in
new file mode 100644
index 00000000..30a5d03f
--- /dev/null
+++ b/documentation/Doxyfile.in
@@ -0,0 +1,2678 @@
+# # # # sol3
+# The MIT License (MIT)
+# 
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# Doxyfile 1.9.1
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "@SOL2_DOXYGEN_PROJECT_NAME@"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = "@SOL2_DOXYGEN_PROJECT_VERSION@"
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "@SOL2_PROJECT_DESCRIPTION@"
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = "@SOL2_DOXYGEN_OUTPUT_DIR@"
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all generated output in the proper direction.
+# Possible values are: None, LTR, RTL and Context.
+# The default value is: None.
+
+OUTPUT_TEXT_DIRECTION  = None
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = YES
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = YES
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 5
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+# When you need a literal { or } or , in the value part of an alias you have to
+# escape them by means of a backslash (\), this can lead to conflicts with the
+# commands \{ and \} for these it is advised to use the version @{ and @} or use
+# a double escape (\\{ and \\})
+
+ALIASES                = "group=@ingroup" "synopsis=@par Synopsis:@n" "effects=@par Effects:@n" "exclude=@if SOL2_EXCLUDED_ELEMENT @endif" "requires=@par Requires:@n"
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
+# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 5
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+# The NUM_PROC_THREADS specifies the number threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which efficively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+RESOLVE_UNNAMED_PARAMS = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and MacOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = YES
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation. If
+# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
+# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the doxygen process doxygen will return with a non-zero status.
+# Possible values are: NO, YES and FAIL_ON_WARNINGS.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = @SOL2_DOXYGEN_INPUT@
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see:
+# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# Note the list of default checked file patterns might differ from the list of
+# default file extension mappings.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
+# *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, *.vhdl,
+# *.ucf, *.qsf and *.ice.
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.idl \
+                         *.ddl \
+                         *.odl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.cs \
+                         *.d \
+                         *.php \
+                         *.php4 \
+                         *.php5 \
+                         *.phtml \
+                         *.inc \
+                         *.m \
+                         *.markdown \
+                         *.md \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.pyw \
+                         *.f90 \
+                         *.f95 \
+                         *.f03 \
+                         *.f08 \
+                         *.f18 \
+                         *.f \
+                         *.for \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf \
+                         *.ice
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = "*/detail/*" "*/vendor/*"
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        = "sol::*detail*" "_M_*" "std"
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# entity all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see:
+# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
+# performance. This can be particularly helpful with template rich C++ code for
+# which doxygen's built-in parser lacks the necessary type information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled and the CLANG_ADD_INC_PATHS tag is set to
+# YES then doxygen will add the directory of each input to the include path.
+# The default value is: YES.
+
+CLANG_ADD_INC_PATHS    = YES
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the directory containing a file called compile_commands.json. This
+# file is the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
+# options used when the source files were built. This is equivalent to
+# specifying the -p option to a clang tool, such as clang-check. These options
+# will then be passed to the parser. Any options specified with CLANG_OPTIONS
+# will be added as well.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = "@SOL2_DOXYGEN_THML_OUTPUT_DIR@"
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via JavaScript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have JavaScript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see:
+# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
+# create a documentation set, doxygen will generate a Makefile in the HTML
+# output directory. Running make will produce the docset in that directory and
+# running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see:
+# https://www.microsoft.com/en-us/download/details.aspx?id=21138) on Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the main .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location (absolute path
+# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
+# run qhelpgenerator on the generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from https://www.mathjax.org before deployment.
+# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = https://cdn.jsdelivr.net/npm/mathjax@2
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using JavaScript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see:
+# https://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see:
+# https://xapian.org/). See the section "External Indexing and Searching" for
+# details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         =
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = YES
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = "@SOL2_DOXYGEN_XML_OUTPUT_DIR@"
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = YES
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = "SOL2_INLINE_ABI_NAMESPACE_OPEN_I_= " "SOL2_INLINE_ABI_NAMESPACE_CLOSE_I_= "
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
+# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
+# tag is set to YES, doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
+# will not generate fields with class member information in the UML graphs. The
+# class diagrams will look similar to the default class diagrams but using UML
+# notation for the relationships.
+# Possible values are: NO, YES and NONE.
+# The default value is: NO.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+DOT_UML_DETAILS        = NO
+
+# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
+# to display on a single line. If the actual line length exceeds this threshold
+# significantly it will wrapped across multiple lines. Some heuristics are apply
+# to avoid ugly line breaks.
+# Minimum value: 0, maximum value: 1000, default value: 17.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_WRAP_THRESHOLD     = 17
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
+# files that are used to generate the various graphs.
+#
+# Note: This setting is not only used for dot files but also for msc and
+# plantuml temporary files.
+# The default value is: YES.
+
+DOT_CLEANUP            = YES
diff --git a/docs/Makefile b/documentation/Makefile
similarity index 100%
rename from docs/Makefile
rename to documentation/Makefile
diff --git a/docs/make.bat b/documentation/make.bat
similarity index 100%
rename from docs/make.bat
rename to documentation/make.bat
diff --git a/docs/presentations/2016.10.14 - ThePhD - No Overhead C Abstraction.pdf b/documentation/presentations/2016.10.14 - ThePhD - No Overhead C Abstraction.pdf
similarity index 100%
rename from docs/presentations/2016.10.14 - ThePhD - No Overhead C Abstraction.pdf
rename to documentation/presentations/2016.10.14 - ThePhD - No Overhead C Abstraction.pdf
diff --git a/docs/presentations/2017.11.08 - ThePhD - Wrapping Lua C in C++.pdf b/documentation/presentations/2017.11.08 - ThePhD - Wrapping Lua C in C++.pdf
similarity index 100%
rename from docs/presentations/2017.11.08 - ThePhD - Wrapping Lua C in C++.pdf
rename to documentation/presentations/2017.11.08 - ThePhD - Wrapping Lua C in C++.pdf
diff --git a/docs/presentations/2018.02.06 - ThePhD - Biting the CMake Bullet.pdf b/documentation/presentations/2018.02.06 - ThePhD - Biting the CMake Bullet.pdf
similarity index 100%
rename from docs/presentations/2018.02.06 - ThePhD - Biting the CMake Bullet.pdf
rename to documentation/presentations/2018.02.06 - ThePhD - Biting the CMake Bullet.pdf
diff --git a/docs/presentations/2018.05.10 - ThePhD - Compile Fast, Run Faster, Scale Forever.pdf b/documentation/presentations/2018.05.10 - ThePhD - Compile Fast, Run Faster, Scale Forever.pdf
similarity index 100%
rename from docs/presentations/2018.05.10 - ThePhD - Compile Fast, Run Faster, Scale Forever.pdf
rename to documentation/presentations/2018.05.10 - ThePhD - Compile Fast, Run Faster, Scale Forever.pdf
diff --git a/docs/presentations/2018.09.28 - ThePhD - Scripting at the Speed of Thought.pdf b/documentation/presentations/2018.09.28 - ThePhD - Scripting at the Speed of Thought.pdf
similarity index 100%
rename from docs/presentations/2018.09.28 - ThePhD - Scripting at the Speed of Thought.pdf
rename to documentation/presentations/2018.09.28 - ThePhD - Scripting at the Speed of Thought.pdf
diff --git a/docs/presentations/2019.05.10 - ThePhD - The Plan for Tomorrow - Compile-Time Extension Points in C++.pdf b/documentation/presentations/2019.05.10 - ThePhD - The Plan for Tomorrow - Compile-Time Extension Points in C++.pdf
similarity index 100%
rename from docs/presentations/2019.05.10 - ThePhD - The Plan for Tomorrow - Compile-Time Extension Points in C++.pdf
rename to documentation/presentations/2019.05.10 - ThePhD - The Plan for Tomorrow - Compile-Time Extension Points in C++.pdf
diff --git a/documentation/requirements.txt b/documentation/requirements.txt
new file mode 100644
index 00000000..d95669ba
--- /dev/null
+++ b/documentation/requirements.txt
@@ -0,0 +1,3 @@
+breathe
+cmake
+ninja
diff --git a/docs/source/_themes/sol2/layout.html b/documentation/source/_themes/sol2/layout.html
similarity index 100%
rename from docs/source/_themes/sol2/layout.html
rename to documentation/source/_themes/sol2/layout.html
diff --git a/docs/source/_themes/sol2/static/search-fix.js_t b/documentation/source/_themes/sol2/static/search-fix.js_t
similarity index 100%
rename from docs/source/_themes/sol2/static/search-fix.js_t
rename to documentation/source/_themes/sol2/static/search-fix.js_t
diff --git a/docs/source/_themes/sol2/static/sol2.css_t b/documentation/source/_themes/sol2/static/sol2.css_t
similarity index 100%
rename from docs/source/_themes/sol2/static/sol2.css_t
rename to documentation/source/_themes/sol2/static/sol2.css_t
diff --git a/docs/source/_themes/sol2/theme.conf b/documentation/source/_themes/sol2/theme.conf
similarity index 100%
rename from docs/source/_themes/sol2/theme.conf
rename to documentation/source/_themes/sol2/theme.conf
diff --git a/docs/source/api/api-top.rst b/documentation/source/api/api-top.rst
similarity index 100%
rename from docs/source/api/api-top.rst
rename to documentation/source/api/api-top.rst
diff --git a/docs/source/api/as_args.rst b/documentation/source/api/as_args.rst
similarity index 100%
rename from docs/source/api/as_args.rst
rename to documentation/source/api/as_args.rst
diff --git a/docs/source/api/as_container.rst b/documentation/source/api/as_container.rst
similarity index 100%
rename from docs/source/api/as_container.rst
rename to documentation/source/api/as_container.rst
diff --git a/docs/source/api/as_function.rst b/documentation/source/api/as_function.rst
similarity index 100%
rename from docs/source/api/as_function.rst
rename to documentation/source/api/as_function.rst
diff --git a/docs/source/api/as_returns.rst b/documentation/source/api/as_returns.rst
similarity index 100%
rename from docs/source/api/as_returns.rst
rename to documentation/source/api/as_returns.rst
diff --git a/docs/source/api/as_table.rst b/documentation/source/api/as_table.rst
similarity index 100%
rename from docs/source/api/as_table.rst
rename to documentation/source/api/as_table.rst
diff --git a/docs/source/api/c_call.rst b/documentation/source/api/c_call.rst
similarity index 100%
rename from docs/source/api/c_call.rst
rename to documentation/source/api/c_call.rst
diff --git a/docs/source/api/compatibility.rst b/documentation/source/api/compatibility.rst
similarity index 100%
rename from docs/source/api/compatibility.rst
rename to documentation/source/api/compatibility.rst
diff --git a/docs/source/api/coroutine.rst b/documentation/source/api/coroutine.rst
similarity index 100%
rename from docs/source/api/coroutine.rst
rename to documentation/source/api/coroutine.rst
diff --git a/docs/source/api/environment.rst b/documentation/source/api/environment.rst
similarity index 100%
rename from docs/source/api/environment.rst
rename to documentation/source/api/environment.rst
diff --git a/docs/source/api/error.rst b/documentation/source/api/error.rst
similarity index 100%
rename from docs/source/api/error.rst
rename to documentation/source/api/error.rst
diff --git a/docs/source/api/function.rst b/documentation/source/api/function.rst
similarity index 100%
rename from docs/source/api/function.rst
rename to documentation/source/api/function.rst
diff --git a/docs/source/api/lua_value.rst b/documentation/source/api/lua_value.rst
similarity index 100%
rename from docs/source/api/lua_value.rst
rename to documentation/source/api/lua_value.rst
diff --git a/docs/source/api/make_reference.rst b/documentation/source/api/make_reference.rst
similarity index 100%
rename from docs/source/api/make_reference.rst
rename to documentation/source/api/make_reference.rst
diff --git a/docs/source/api/metatable_key.rst b/documentation/source/api/metatable_key.rst
similarity index 100%
rename from docs/source/api/metatable_key.rst
rename to documentation/source/api/metatable_key.rst
diff --git a/docs/source/api/nested.rst b/documentation/source/api/nested.rst
similarity index 100%
rename from docs/source/api/nested.rst
rename to documentation/source/api/nested.rst
diff --git a/docs/source/api/new_table.rst b/documentation/source/api/new_table.rst
similarity index 100%
rename from docs/source/api/new_table.rst
rename to documentation/source/api/new_table.rst
diff --git a/docs/source/api/object.rst b/documentation/source/api/object.rst
similarity index 100%
rename from docs/source/api/object.rst
rename to documentation/source/api/object.rst
diff --git a/docs/source/api/optional.rst b/documentation/source/api/optional.rst
similarity index 100%
rename from docs/source/api/optional.rst
rename to documentation/source/api/optional.rst
diff --git a/docs/source/api/overload.rst b/documentation/source/api/overload.rst
similarity index 100%
rename from docs/source/api/overload.rst
rename to documentation/source/api/overload.rst
diff --git a/docs/source/api/policies.rst b/documentation/source/api/policies.rst
similarity index 100%
rename from docs/source/api/policies.rst
rename to documentation/source/api/policies.rst
diff --git a/docs/source/api/property.rst b/documentation/source/api/property.rst
similarity index 100%
rename from docs/source/api/property.rst
rename to documentation/source/api/property.rst
diff --git a/docs/source/api/protect.rst b/documentation/source/api/protect.rst
similarity index 100%
rename from docs/source/api/protect.rst
rename to documentation/source/api/protect.rst
diff --git a/docs/source/api/protected_function.rst b/documentation/source/api/protected_function.rst
similarity index 98%
rename from docs/source/api/protected_function.rst
rename to documentation/source/api/protected_function.rst
index ca51f8a7..b6e21a07 100644
--- a/docs/source/api/protected_function.rst
+++ b/documentation/source/api/protected_function.rst
@@ -105,7 +105,8 @@ Get and set the Lua entity that is used as the default error handler. The defaul
 	:caption: variable: handler
 	:name: protected-function-error-handler
 
-	reference error_handler;
+	reference get_error_handler() const;
+	void set_error_handler(reference handler);
 
 The error-handler that is called should a runtime error that Lua can detect occurs. The error handler function needs to take a single string argument (use type std::string if you want to use a C++ function bound to lua as the error handler) and return a single string argument (again, return a std::string or string-alike argument from the C++ function if you're using one as the error handler). If :doc:`exceptions<../exceptions>` are enabled, sol will attempt to convert the ``.what()`` argument of the exception into a string and then call the error handling function. It is a :doc:`reference<reference>`, as it must refer to something that exists in the lua registry or on the Lua stack. This is automatically set to the default error handler when ``protected_function`` is constructed.
 
diff --git a/docs/source/api/proxy.rst b/documentation/source/api/proxy.rst
similarity index 100%
rename from docs/source/api/proxy.rst
rename to documentation/source/api/proxy.rst
diff --git a/docs/source/api/readonly.rst b/documentation/source/api/readonly.rst
similarity index 100%
rename from docs/source/api/readonly.rst
rename to documentation/source/api/readonly.rst
diff --git a/docs/source/api/reference.rst b/documentation/source/api/reference.rst
similarity index 100%
rename from docs/source/api/reference.rst
rename to documentation/source/api/reference.rst
diff --git a/docs/source/api/resolve.rst b/documentation/source/api/resolve.rst
similarity index 100%
rename from docs/source/api/resolve.rst
rename to documentation/source/api/resolve.rst
diff --git a/docs/source/api/stack.rst b/documentation/source/api/stack.rst
similarity index 100%
rename from docs/source/api/stack.rst
rename to documentation/source/api/stack.rst
diff --git a/docs/source/api/stack_reference.rst b/documentation/source/api/stack_reference.rst
similarity index 82%
rename from docs/source/api/stack_reference.rst
rename to documentation/source/api/stack_reference.rst
index 98c341bf..8b5dd6b8 100644
--- a/docs/source/api/stack_reference.rst
+++ b/documentation/source/api/stack_reference.rst
@@ -26,4 +26,4 @@ Finally, there is a special abstraction that provides further stack optimization
 
 .. warning::
 
-	Do not use ``sol::stack_count`` with a ``sol::stack_aligned_protected_function``. The default behavior checks if the ``error_handler`` member variable is valid, and attempts to push the handler onto the stack in preparation for calling the function. This inevitably changes the stack. Only use ``sol::stack_aligned_protected_function`` with ``sol::stack_count`` if you know that the handler is not valid (it is ``nil`` or its ``error_handler.valid()`` function returns ``false``), or if you use ``sol::stack_aligned_stack_handler_protected_function``, which references an existing stack index that can be before the precise placement of the function and its arguments.
+	Do not use ``sol::stack_count`` with a ``sol::stack_aligned_protected_function``. The default behavior checks if the ``get_error_handler`` function returns a valid object, and attempts to push the handler onto the stack in preparation for calling the function. This inevitably changes the stack. Only use ``sol::stack_aligned_protected_function`` with ``sol::stack_count`` if you know that the handler is not valid (it is ``nil`` or the ``get_error_handler().valid()`` function call returns ``false``), or if you use ``sol::stack_aligned_stack_handler_protected_function``, which references an existing stack index that can be before the precise placement of the function and its arguments.
diff --git a/docs/source/api/state.rst b/documentation/source/api/state.rst
similarity index 100%
rename from docs/source/api/state.rst
rename to documentation/source/api/state.rst
diff --git a/docs/source/api/table.rst b/documentation/source/api/table.rst
similarity index 100%
rename from docs/source/api/table.rst
rename to documentation/source/api/table.rst
diff --git a/docs/source/api/table_traversal_keys.rst b/documentation/source/api/table_traversal_keys.rst
similarity index 100%
rename from docs/source/api/table_traversal_keys.rst
rename to documentation/source/api/table_traversal_keys.rst
diff --git a/docs/source/api/this_environment.rst b/documentation/source/api/this_environment.rst
similarity index 100%
rename from docs/source/api/this_environment.rst
rename to documentation/source/api/this_environment.rst
diff --git a/docs/source/api/this_state.rst b/documentation/source/api/this_state.rst
similarity index 100%
rename from docs/source/api/this_state.rst
rename to documentation/source/api/this_state.rst
diff --git a/docs/source/api/thread.rst b/documentation/source/api/thread.rst
similarity index 100%
rename from docs/source/api/thread.rst
rename to documentation/source/api/thread.rst
diff --git a/docs/source/api/tie.rst b/documentation/source/api/tie.rst
similarity index 100%
rename from docs/source/api/tie.rst
rename to documentation/source/api/tie.rst
diff --git a/docs/source/api/types.rst b/documentation/source/api/types.rst
similarity index 100%
rename from docs/source/api/types.rst
rename to documentation/source/api/types.rst
diff --git a/docs/source/api/unique_usertype_traits.rst b/documentation/source/api/unique_usertype_traits.rst
similarity index 100%
rename from docs/source/api/unique_usertype_traits.rst
rename to documentation/source/api/unique_usertype_traits.rst
diff --git a/docs/source/api/user.rst b/documentation/source/api/user.rst
similarity index 100%
rename from docs/source/api/user.rst
rename to documentation/source/api/user.rst
diff --git a/docs/source/api/userdata.rst b/documentation/source/api/userdata.rst
similarity index 100%
rename from docs/source/api/userdata.rst
rename to documentation/source/api/userdata.rst
diff --git a/docs/source/api/usertype.rst b/documentation/source/api/usertype.rst
similarity index 100%
rename from docs/source/api/usertype.rst
rename to documentation/source/api/usertype.rst
diff --git a/docs/source/api/usertype_memory.rst b/documentation/source/api/usertype_memory.rst
similarity index 100%
rename from docs/source/api/usertype_memory.rst
rename to documentation/source/api/usertype_memory.rst
diff --git a/docs/source/api/var.rst b/documentation/source/api/var.rst
similarity index 100%
rename from docs/source/api/var.rst
rename to documentation/source/api/var.rst
diff --git a/docs/source/api/variadic_args.rst b/documentation/source/api/variadic_args.rst
similarity index 100%
rename from docs/source/api/variadic_args.rst
rename to documentation/source/api/variadic_args.rst
diff --git a/docs/source/api/variadic_results.rst b/documentation/source/api/variadic_results.rst
similarity index 100%
rename from docs/source/api/variadic_results.rst
rename to documentation/source/api/variadic_results.rst
diff --git a/docs/source/api/yielding.rst b/documentation/source/api/yielding.rst
similarity index 100%
rename from docs/source/api/yielding.rst
rename to documentation/source/api/yielding.rst
diff --git a/docs/source/benchmarks.rst b/documentation/source/benchmarks.rst
similarity index 100%
rename from docs/source/benchmarks.rst
rename to documentation/source/benchmarks.rst
diff --git a/docs/source/build.rst b/documentation/source/build.rst
similarity index 100%
rename from docs/source/build.rst
rename to documentation/source/build.rst
diff --git a/docs/source/codecvt.rst b/documentation/source/codecvt.rst
similarity index 100%
rename from docs/source/codecvt.rst
rename to documentation/source/codecvt.rst
diff --git a/docs/source/compilation.rst b/documentation/source/compilation.rst
similarity index 100%
rename from docs/source/compilation.rst
rename to documentation/source/compilation.rst
diff --git a/docs/source/conf.py b/documentation/source/conf.py
similarity index 81%
rename from docs/source/conf.py
rename to documentation/source/conf.py
index 0c1a3e8e..2356ff35 100644
--- a/docs/source/conf.py
+++ b/documentation/source/conf.py
@@ -13,8 +13,10 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
+import subprocess
+import typing
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -29,7 +31,10 @@ import os
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo']
+extensions = [
+    'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo', 'breathe',
+    'sphinx.ext.autosectionlabel'
+]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
@@ -46,8 +51,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = 'sol'
-copyright = '2019, ThePhD'
+project = 'sol2'
+copyright = '2021, ThePhD'
 author = 'ThePhD'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -55,9 +60,9 @@ author = 'ThePhD'
 # built documents.
 #
 # The short X.Y version.
-version = '3.2'
+version = '4.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.2.3'
+release = '4.0.0-alpha'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -74,7 +79,7 @@ language = None
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = []
+exclude_patterns: typing.List[str] = []
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
@@ -95,7 +100,7 @@ exclude_patterns = []
 pygments_style = 'sphinx'
 
 # The default highlighting language: default is python
-highlight_language = 'c++'
+highlight_language = 'cpp'
 
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
@@ -141,7 +146,7 @@ html_theme_path = [
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = []
+html_static_path: typing.List[str] = []
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
@@ -208,7 +213,7 @@ htmlhelp_basename = 'Soldoc'
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_elements = {
+latex_elements: dict = {
     # The paper size ('letterpaper' or 'a4paper').
     #'papersize': 'letterpaper',
 
@@ -279,3 +284,69 @@ texinfo_documents = [
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
+
+# -- Options for Breathe -------------------------------------------
+
+# C++ Index Configuration
+#
+cpp_index_common_prefix = ['sol::']
+
+# Breathe Configuration
+#
+breathe_projects = {}
+breathe_default_project = "sol2"
+
+# -- Options for autosectionlabel ---------------------------------
+
+# autosectionlabel Configuration
+#
+autosectionlabel_prefix_document = True
+
+# ReadTheDocs Build Help
+#
+
+
+def run_cmake_doxygen():
+	"""Run the cmake command to get the doxygen sources"""
+
+	# Make sure the directory exists
+	cmake_dir = os.path.join(os.getcwd(), '_build/cmake-build')
+	xml_dir = os.path.join(cmake_dir, 'documentation/doxygen/xml')
+	os.makedirs(cmake_dir, exist_ok=True)
+	os.makedirs(xml_dir, exist_ok=True)
+	print("[conf.py] CMake Directory: %s" % cmake_dir)
+	print("[conf.py] XML Directory: %s" % xml_dir)
+
+	try:
+		retcode = subprocess.call(
+		    "cmake -DZTD_TEXT_DOCUMENTATION:BOOL=TRUE -DZTD_TEXT_DOCUMENTATION_NO_SPHINX:BOOL=TRUE ../../../..",
+		    shell=True,
+		    cwd=cmake_dir)
+	except OSError as e:
+		sys.stderr.write("cmake generation execution failed: %s\n" % e)
+		return
+
+	try:
+		retcode = subprocess.call("cmake --build .",
+		                          shell=True,
+		                          cwd=cmake_dir)
+	except OSError as e:
+		sys.stderr.write("cmake generation execution failed: %s\n" % e)
+		return
+
+	breathe_projects["sol2"] = xml_dir
+
+
+def generate_doxygen_xml(app):
+	"""Run the doxygen make commands if we're on the ReadTheDocs server"""
+
+	read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
+
+	if read_the_docs_build:
+		run_cmake_doxygen()
+
+
+def setup(app):
+
+	# Add hook for building doxygen xml when needed
+	app.connect("builder-inited", generate_doxygen_xml)
\ No newline at end of file
diff --git a/docs/source/containers.rst b/documentation/source/containers.rst
similarity index 100%
rename from docs/source/containers.rst
rename to documentation/source/containers.rst
diff --git a/docs/source/errors.rst b/documentation/source/errors.rst
similarity index 100%
rename from docs/source/errors.rst
rename to documentation/source/errors.rst
diff --git a/docs/source/exceptions.rst b/documentation/source/exceptions.rst
similarity index 100%
rename from docs/source/exceptions.rst
rename to documentation/source/exceptions.rst
diff --git a/docs/source/features.rst b/documentation/source/features.rst
similarity index 99%
rename from docs/source/features.rst
rename to documentation/source/features.rst
index 59bf8379..88074e0f 100644
--- a/docs/source/features.rst
+++ b/documentation/source/features.rst
@@ -29,7 +29,7 @@ what sol supports
  	- Pull out any Lua function with :doc:`sol::function<api/function>`: ``sol::function fx = table["socket_send"];``
  	- Can also set callables into :doc:`operator[] proxies<api/proxy>`: ``table["move_dude"] = &engine::move_dude;``
  	- Safety: use :doc:`sol::protected_function<api/protected_function>` to catch any kind of error
- 		+ ANY kind: C++ exception or Lua erors are trapped and run through the optional ``error_handler`` variable
+ 		+ ANY kind: C++ exception or Lua errors are trapped and run through the optional error handler stored in the protected function
  	- *Advanced:* :doc:`overloading of a single function name<api/overload>` so you don't need to do boring typechecks
  	- *Advanced:* :doc:`efficient handling and well-documented<functions>` way of dealing with arguments
 
diff --git a/docs/source/functions.rst b/documentation/source/functions.rst
similarity index 100%
rename from docs/source/functions.rst
rename to documentation/source/functions.rst
diff --git a/docs/source/index.rst b/documentation/source/index.rst
similarity index 100%
rename from docs/source/index.rst
rename to documentation/source/index.rst
diff --git a/docs/source/licenses.rst b/documentation/source/licenses.rst
similarity index 100%
rename from docs/source/licenses.rst
rename to documentation/source/licenses.rst
diff --git a/docs/source/media/Ko-fi_Blue.png b/documentation/source/media/Ko-fi_Blue.png
similarity index 100%
rename from docs/source/media/Ko-fi_Blue.png
rename to documentation/source/media/Ko-fi_Blue.png
diff --git a/docs/source/media/become_a_patron_button.png b/documentation/source/media/become_a_patron_button.png
similarity index 100%
rename from docs/source/media/become_a_patron_button.png
rename to documentation/source/media/become_a_patron_button.png
diff --git a/docs/source/media/bench/base_derived.png b/documentation/source/media/bench/base_derived.png
similarity index 100%
rename from docs/source/media/bench/base_derived.png
rename to documentation/source/media/bench/base_derived.png
diff --git a/docs/source/media/bench/c_function.png b/documentation/source/media/bench/c_function.png
similarity index 100%
rename from docs/source/media/bench/c_function.png
rename to documentation/source/media/bench/c_function.png
diff --git a/docs/source/media/bench/c_function_through_lua_in_c.png b/documentation/source/media/bench/c_function_through_lua_in_c.png
similarity index 100%
rename from docs/source/media/bench/c_function_through_lua_in_c.png
rename to documentation/source/media/bench/c_function_through_lua_in_c.png
diff --git a/docs/source/media/bench/implicit_inheritance.png b/documentation/source/media/bench/implicit_inheritance.png
similarity index 100%
rename from docs/source/media/bench/implicit_inheritance.png
rename to documentation/source/media/bench/implicit_inheritance.png
diff --git a/docs/source/media/bench/lua_bindings_shootout.json b/documentation/source/media/bench/lua_bindings_shootout.json
similarity index 100%
rename from docs/source/media/bench/lua_bindings_shootout.json
rename to documentation/source/media/bench/lua_bindings_shootout.json
diff --git a/docs/source/media/bench/lua_function_in_c.png b/documentation/source/media/bench/lua_function_in_c.png
similarity index 100%
rename from docs/source/media/bench/lua_function_in_c.png
rename to documentation/source/media/bench/lua_function_in_c.png
diff --git a/docs/source/media/bench/member_function_call.png b/documentation/source/media/bench/member_function_call.png
similarity index 100%
rename from docs/source/media/bench/member_function_call.png
rename to documentation/source/media/bench/member_function_call.png
diff --git a/docs/source/media/bench/multi_return.png b/documentation/source/media/bench/multi_return.png
similarity index 100%
rename from docs/source/media/bench/multi_return.png
rename to documentation/source/media/bench/multi_return.png
diff --git a/docs/source/media/bench/multi_return_lua.png b/documentation/source/media/bench/multi_return_lua.png
similarity index 100%
rename from docs/source/media/bench/multi_return_lua.png
rename to documentation/source/media/bench/multi_return_lua.png
diff --git a/docs/source/media/bench/optional_failure.png b/documentation/source/media/bench/optional_failure.png
similarity index 100%
rename from docs/source/media/bench/optional_failure.png
rename to documentation/source/media/bench/optional_failure.png
diff --git a/docs/source/media/bench/optional_half_failure.png b/documentation/source/media/bench/optional_half_failure.png
similarity index 100%
rename from docs/source/media/bench/optional_half_failure.png
rename to documentation/source/media/bench/optional_half_failure.png
diff --git a/docs/source/media/bench/optional_success.png b/documentation/source/media/bench/optional_success.png
similarity index 100%
rename from docs/source/media/bench/optional_success.png
rename to documentation/source/media/bench/optional_success.png
diff --git a/docs/source/media/bench/return_userdata.png b/documentation/source/media/bench/return_userdata.png
similarity index 100%
rename from docs/source/media/bench/return_userdata.png
rename to documentation/source/media/bench/return_userdata.png
diff --git a/docs/source/media/bench/stateful_function_object.png b/documentation/source/media/bench/stateful_function_object.png
similarity index 100%
rename from docs/source/media/bench/stateful_function_object.png
rename to documentation/source/media/bench/stateful_function_object.png
diff --git a/docs/source/media/bench/table_chained_get.png b/documentation/source/media/bench/table_chained_get.png
similarity index 100%
rename from docs/source/media/bench/table_chained_get.png
rename to documentation/source/media/bench/table_chained_get.png
diff --git a/docs/source/media/bench/table_chained_set.png b/documentation/source/media/bench/table_chained_set.png
similarity index 100%
rename from docs/source/media/bench/table_chained_set.png
rename to documentation/source/media/bench/table_chained_set.png
diff --git a/docs/source/media/bench/table_get.png b/documentation/source/media/bench/table_get.png
similarity index 100%
rename from docs/source/media/bench/table_get.png
rename to documentation/source/media/bench/table_get.png
diff --git a/docs/source/media/bench/table_global_string_get.png b/documentation/source/media/bench/table_global_string_get.png
similarity index 100%
rename from docs/source/media/bench/table_global_string_get.png
rename to documentation/source/media/bench/table_global_string_get.png
diff --git a/docs/source/media/bench/table_global_string_set.png b/documentation/source/media/bench/table_global_string_set.png
similarity index 100%
rename from docs/source/media/bench/table_global_string_set.png
rename to documentation/source/media/bench/table_global_string_set.png
diff --git a/docs/source/media/bench/table_set.png b/documentation/source/media/bench/table_set.png
similarity index 100%
rename from docs/source/media/bench/table_set.png
rename to documentation/source/media/bench/table_set.png
diff --git a/docs/source/media/bench/userdata_variable_access.png b/documentation/source/media/bench/userdata_variable_access.png
similarity index 100%
rename from docs/source/media/bench/userdata_variable_access.png
rename to documentation/source/media/bench/userdata_variable_access.png
diff --git a/docs/source/media/bench/userdata_variable_access_large.png b/documentation/source/media/bench/userdata_variable_access_large.png
similarity index 100%
rename from docs/source/media/bench/userdata_variable_access_large.png
rename to documentation/source/media/bench/userdata_variable_access_large.png
diff --git a/docs/source/media/bench/userdata_variable_access_last.png b/documentation/source/media/bench/userdata_variable_access_last.png
similarity index 100%
rename from docs/source/media/bench/userdata_variable_access_last.png
rename to documentation/source/media/bench/userdata_variable_access_last.png
diff --git a/docs/source/media/discord_logo_wordmark.png b/documentation/source/media/discord_logo_wordmark.png
similarity index 100%
rename from docs/source/media/discord_logo_wordmark.png
rename to documentation/source/media/discord_logo_wordmark.png
diff --git a/docs/source/media/eevee_code_after.jpg b/documentation/source/media/eevee_code_after.jpg
similarity index 100%
rename from docs/source/media/eevee_code_after.jpg
rename to documentation/source/media/eevee_code_after.jpg
diff --git a/docs/source/media/eevee_code_before.jpg b/documentation/source/media/eevee_code_before.jpg
similarity index 100%
rename from docs/source/media/eevee_code_before.jpg
rename to documentation/source/media/eevee_code_before.jpg
diff --git a/docs/source/media/github_logo.png b/documentation/source/media/github_logo.png
similarity index 100%
rename from docs/source/media/github_logo.png
rename to documentation/source/media/github_logo.png
diff --git a/docs/source/media/github_sponsors_logo.png b/documentation/source/media/github_sponsors_logo.png
similarity index 100%
rename from docs/source/media/github_sponsors_logo.png
rename to documentation/source/media/github_sponsors_logo.png
diff --git a/docs/source/media/liberapay_logo.png b/documentation/source/media/liberapay_logo.png
similarity index 100%
rename from docs/source/media/liberapay_logo.png
rename to documentation/source/media/liberapay_logo.png
diff --git a/docs/source/media/pp_cc_mark_111x69.jpg b/documentation/source/media/pp_cc_mark_111x69.jpg
similarity index 100%
rename from docs/source/media/pp_cc_mark_111x69.jpg
rename to documentation/source/media/pp_cc_mark_111x69.jpg
diff --git a/docs/source/media/sol.png b/documentation/source/media/sol.png
similarity index 100%
rename from docs/source/media/sol.png
rename to documentation/source/media/sol.png
diff --git a/docs/source/media/sol.psd b/documentation/source/media/sol.psd
similarity index 100%
rename from docs/source/media/sol.psd
rename to documentation/source/media/sol.psd
diff --git a/docs/source/mentions.rst b/documentation/source/mentions.rst
similarity index 100%
rename from docs/source/mentions.rst
rename to documentation/source/mentions.rst
diff --git a/docs/source/origin.rst b/documentation/source/origin.rst
similarity index 100%
rename from docs/source/origin.rst
rename to documentation/source/origin.rst
diff --git a/docs/source/performance.rst b/documentation/source/performance.rst
similarity index 100%
rename from docs/source/performance.rst
rename to documentation/source/performance.rst
diff --git a/docs/source/rtti.rst b/documentation/source/rtti.rst
similarity index 100%
rename from docs/source/rtti.rst
rename to documentation/source/rtti.rst
diff --git a/docs/source/safety.rst b/documentation/source/safety.rst
similarity index 100%
rename from docs/source/safety.rst
rename to documentation/source/safety.rst
diff --git a/docs/source/threading.rst b/documentation/source/threading.rst
similarity index 100%
rename from docs/source/threading.rst
rename to documentation/source/threading.rst
diff --git a/docs/source/traits.rst b/documentation/source/traits.rst
similarity index 100%
rename from docs/source/traits.rst
rename to documentation/source/traits.rst
diff --git a/docs/source/tutorial/all-the-things.rst b/documentation/source/tutorial/all-the-things.rst
similarity index 99%
rename from docs/source/tutorial/all-the-things.rst
rename to documentation/source/tutorial/all-the-things.rst
index 74a36ec7..a22aae07 100644
--- a/docs/source/tutorial/all-the-things.rst
+++ b/documentation/source/tutorial/all-the-things.rst
@@ -22,7 +22,7 @@ You'll need to ``#include <sol/sol.hpp>`` somewhere in your code. sol is header-
 
 The implementation for ``assert.hpp`` with ``c_assert`` looks like so:
 
-.. literalinclude:: ../../../examples/include/assert.hpp
+.. literalinclude:: ../../../include/sol/assert.hpp
 	:linenos:
 	:lines: 1-3, 19-
 
diff --git a/docs/source/tutorial/customization.rst b/documentation/source/tutorial/customization.rst
similarity index 100%
rename from docs/source/tutorial/customization.rst
rename to documentation/source/tutorial/customization.rst
diff --git a/docs/source/tutorial/cxx-in-lua.rst b/documentation/source/tutorial/cxx-in-lua.rst
similarity index 100%
rename from docs/source/tutorial/cxx-in-lua.rst
rename to documentation/source/tutorial/cxx-in-lua.rst
diff --git a/docs/source/tutorial/existing.rst b/documentation/source/tutorial/existing.rst
similarity index 100%
rename from docs/source/tutorial/existing.rst
rename to documentation/source/tutorial/existing.rst
diff --git a/docs/source/tutorial/functions.rst b/documentation/source/tutorial/functions.rst
similarity index 62%
rename from docs/source/tutorial/functions.rst
rename to documentation/source/tutorial/functions.rst
index 7536ff8c..6646bc1e 100644
--- a/docs/source/tutorial/functions.rst
+++ b/documentation/source/tutorial/functions.rst
@@ -8,194 +8,80 @@ Setting a new function
 
 Given a C++ function, you can drop it into sol in several equivalent ways, working similar to how :ref:`setting variables<writing-variables-demo>` works:
 
-.. code-block:: cpp
+.. literalinclude:: ../../../examples/source/tutorials/writing_functions.cpp
+	:language: cpp
 	:linenos:
-	:caption: Registering C++ functions
 	:name: writing-functions
-
-	#include <sol/sol.hpp>
-
-	std::string my_function( int a, std::string b ) {
-		// Create a string with the letter 'D' "a" times,
-		// append it to 'b'
-		return b + std::string( 'D', a ); 
-	}
-
-	int main () {
-
-		sol::state lua;
-
-		lua["my_func"] = my_function; // way 1
-		lua.set("my_func", my_function); // way 2
-		lua.set_function("my_func", my_function); // way 3
-
-		// This function is now accessible as 'my_func' in
-		// lua scripts / code run on this state:
-		lua.script("some_str = my_func(1, 'Da')");
-
-		// Read out the global variable we stored in 'some_str' in the
-		// quick lua code we just executed
-		std::string some_str = lua["some_str"];
-		// some_str == "DaD"
-	}
+	:caption: Registering C++ functions.
 
 The same code works with all sorts of functions, from member function/variable pointers you have on a class as well as lambdas:
 
-.. code-block:: cpp
+.. literalinclude:: ../../../examples/source/tutorials/writing_member_functions.cpp
+	:language: cpp
 	:linenos:
 	:caption: Registering C++ member functions
 	:name: writing-member-functions
 
-	struct my_class {
-		int a = 0;
 
-		my_class(int x) : a(x) {
-
-		}
-
-		int func() {
-			++a; // increment a by 1
-			return a;
-		}
-	};
-
-	int main () {
-
-		sol::state lua;
-
-		// Here, we are binding the member function and a class instance: it will call the function on
-		// the given class instance
-		lua.set_function("my_class_func", &my_class::func, my_class());
-
-		// We do not pass a class instance here:
-		// the function will need you to pass an instance of "my_class" to it
-		// in lua to work, as shown below
-		lua.set_function("my_class_func_2", &my_class::func);
-
-		// With a pre-bound instance:
-		lua.script(R"(
-			first_value = my_class_func()
-			second_value = my_class_func()
-		)");
-		// first_value == 1
-		// second_value == 2
-
-		// With no bound instance:
-		lua.set("obj", my_class(24));
-		// Calls "func" on the class instance
-		// referenced by "obj" in Lua
-		lua.script(R"(
-			third_value = my_class_func_2(obj)
-			fourth_value = my_class_func_2(obj)
-		)");
-		// first_value == 25
-		// second_value == 26
-	}
 
 Member class functions and member class variables will both be turned into functions when set in this manner. You can get intuitive variable with the ``obj.a = value`` access after this section when you learn about :doc:`usertypes to have C++ in Lua<cxx-in-lua>`, but for now we're just dealing with functions!
 
 
 Another question a lot of people have is about function templates. Function templates -- member functions or free functions -- cannot be registered because they do not exist until you instantiate them in C++. Therefore, given a templated function such as:
 
-.. code-block:: cpp
+.. literalinclude:: ../../../examples/source/tutorials/writing_template_functions.cpp
+	:language: cpp
 	:linenos:
+	:lines: 4-7
 	:caption: A C++ templated function
-	:name: writing-templated-functions-the-func
-
-	template <typename A, typename B>
-	auto my_add( A a, B b ) {
-		return a + b; 
-	}
-
+	:name: writing-templated-functions-my_add
 
 You must specify all the template arguments in order to bind and use it, like so:
 
-.. code-block:: cpp
+.. literalinclude:: ../../../examples/source/tutorials/writing_template_functions.cpp
+	:language: cpp
 	:linenos:
+	:lines: 7-
 	:caption: Registering function template instantiations
 	:name: writing-templated-functions
 
-
-	int main () {
-
-		sol::state lua;
-
-		// adds 2 integers
-		lua["my_int_add"] = my_add<int, int>;
-		
-		// concatenates 2 strings
-		lua["my_string_combine"] = my_add<std::string, std::string>;
-
-		lua.script("my_num = my_int_add(1, 2)");
-		int my_num = lua["my_num"];
-		// my_num == 3
-		
-		lua.script("my_str = my_string_combine('bark bark', ' woof woof')");
-		std::string my_str = lua["my_str"];
-		// my_str == "bark bark woof woof"
-	}
-
 Notice here that we bind two separate functions. What if we wanted to bind only one function, but have it behave differently based on what arguments it is called with? This is called Overloading, and it can be done with :doc:`sol::overload<../api/overload>` like so:
 
-.. code-block:: cpp
+.. literalinclude:: ../../../examples/source/tutorials/writing_overloaded_template_functions.cpp
+	:language: cpp
 	:linenos:
 	:caption: Registering C++ function template instantiations
 	:name: writing-templated-functions-overloaded
 
-
-	int main () {
-
-		sol::state lua;
-
-		// adds 2 integers
-		lua["my_combine"] = sol::overload( my_add<int, int>, my_add<std::string, std::string> );
-		
-		lua.script("my_num = my_combine(1, 2)");
-		lua.script("my_str = my_combine('bark bark', ' woof woof')");
-		int my_num = lua["my_num"];
-		std::string my_str = lua["my_str"];
-		// my_num == 3
-		// my_str == "bark bark woof woof"
-	}
-
 This is useful for functions which can take multiple types and need to behave differently based on those types. You can set as many overloads as you want, and they can be of many different types.
 
-As a side note, binding functions with default parameters does not magically bind multiple versions of the function to be called with the default parameters. You must instead use :doc:`sol::overload<../api/overload>`.
+..note::
 
-As a side note, please make sure to understand Make sure you understand the :ref:`implications of binding a lambda/callable struct in the various ways<binding-callable-objects>` and what it means for your code!
+	Binding functions with default parameters (``void func(int a = 1)``) does not magically bind multiple versions of the function to be called with the default parameters. You must instead use :doc:`sol::overload<../api/overload>` and bind the full version of the function, with lambdas or similar for the function calls one by one.
+
+..note::
+
+	please make sure to understand the :ref:`implications of binding a lambda/callable struct in the various ways<binding-callable-objects>` and what it means for your code!
 
 
 Getting a function from Lua
 ---------------------------
 
-There are 2 ways to get a function from Lua. One is with :doc:`sol::function<../api/function>` and the other is a more advanced wrapper with :doc:`sol::protected_function<../api/protected_function>`. Use them to retrieve callables from Lua and call the underlying function, in two ways:
+There are 2 ways to get a function from Lua. One is with :doc:`sol::unsafe_function<../api/function>` and the other is a more advanced wrapper with :doc:`sol::protected_function<../api/protected_function>`. As the names indicate, one is safer and allows you to introspect on errors during the function's execution, while the other assumes that everything ran fine and simply provides the result (for an often negligible increase in speed).
 
-.. code-block:: cpp
+You can use them to retrieve callables from Lua and call the underlying function, in two ways:
+
+.. literalinclude:: ../../../examples/source/tutorials/reading_functions.cpp
+	:language: cpp
 	:linenos:
-	:caption: Retrieving a sol::function 
+	:caption: Retrieving a sol::(unsafe_/protected_)function
 	:name: reading-functions
 
-	int main () {
+.. note::
 
-		sol::state lua;
+	``sol::function`` is an alias for either ``sol::protected_function`` or ``sol::unsafe_function``, depending on the :doc:`configuration settings </safety>`.
 
-		lua.script(R"(
-			function f (a)
-				return a + 5
-			end
-		)");
-
-		// Get and immediately call
-		int x = lua["f"](30);
-		// x == 35
-
-		// Store it into a variable first, then call
-		sol::function f = lua["f"];
-		int y = f(20);
-		// y == 25
-	}
-
-You can get anything that's a callable in Lua, including C++ functions you bind using ``set_function`` or similar. ``sol::protected_function`` behaves similarly to ``sol::function``, but has a :ref:`error_handler<protected-function-error-handler>` variable you can set to a Lua function. This catches all errors and runs them through the error-handling function:
+You can get anything that's a callable in Lua, including C++ functions bound using ``set_function`` or similar. ``sol::protected_function`` behaves similarly to ``sol::unsafe_function``, but has a :ref:`set_error_handler() <protected-function-error-handler>` variable you can set to a Lua function. This catches all errors and runs them through the error-handling function:
 
 
 .. code-block:: cpp
@@ -220,7 +106,7 @@ You can get anything that's a callable in Lua, including C++ functions you bind
 		)");
 
 		sol::protected_function f = lua["f"];
-		f.error_handler = lua["handler"];
+		f.set_error_handler(lua["handler"]);
 
 		sol::protected_function_result result = f(-500);
 		if (result.valid()) {
diff --git a/docs/source/tutorial/getting-started.rst b/documentation/source/tutorial/getting-started.rst
similarity index 100%
rename from docs/source/tutorial/getting-started.rst
rename to documentation/source/tutorial/getting-started.rst
diff --git a/docs/source/tutorial/ownership.rst b/documentation/source/tutorial/ownership.rst
similarity index 100%
rename from docs/source/tutorial/ownership.rst
rename to documentation/source/tutorial/ownership.rst
diff --git a/docs/source/tutorial/tutorial-top.rst b/documentation/source/tutorial/tutorial-top.rst
similarity index 100%
rename from docs/source/tutorial/tutorial-top.rst
rename to documentation/source/tutorial/tutorial-top.rst
diff --git a/docs/source/tutorial/variables.rst b/documentation/source/tutorial/variables.rst
similarity index 100%
rename from docs/source/tutorial/variables.rst
rename to documentation/source/tutorial/variables.rst
diff --git a/docs/source/usertypes.rst b/documentation/source/usertypes.rst
similarity index 100%
rename from docs/source/usertypes.rst
rename to documentation/source/usertypes.rst
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index d4fefd6f..b28d658c 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -39,41 +39,30 @@ endif()
 # # In-depth customization example
 add_subdirectory(customization)
 
-# # Utility assert.hpp "library" 
-add_library(sol2_assert INTERFACE)
-add_library(sol2::assert ALIAS sol2_assert)
-set_target_properties(sol2_assert
-	PROPERTIES
-	INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include")
-if (SOL2_CI)
-	target_compile_definitions(sol2_assert 
-		INTERFACE SOL2_CI)
-endif()
-
 # # single-source compilable examples
 
-file(GLOB EXAMPLES_SRC source/*.cpp source/tutorials/*.cpp source/tutorials/quick_n_dirty/*.cpp source/docs/*.cpp)
-source_group(examples FILES ${EXAMPLES_SRC})
+file(GLOB sol2.examples.sources source/*.cpp source/tutorials/*.cpp source/tutorials/quick_n_dirty/*.cpp source/docs/*.cpp)
+source_group(examples FILES ${sol2.examples.sources})
 
-function (MAKE_EXAMPLE example_source_file example_suffix target_sol)
+function (MAKE_EXAMPLE example_source_file example_prefix target_sol)
 	
 	get_filename_component(example_name ${example_source_file} NAME_WE)
 	file(RELATIVE_PATH example_source_file_relative ${CMAKE_SOURCE_DIR} ${example_source_file})
 	get_filename_component(example_output_relative_dir ${example_source_file_relative} DIRECTORY)
 	file(TO_CMAKE_PATH "${example_output_relative_dir}" example_output_relative_dir_name)
 	STRING(REGEX REPLACE "/" "." example_output_relative_dir_name "${example_output_relative_dir}")
-	set(example_name "${example_name}${example_suffix}")
 	if (example_output_relative_dir_name STREQUAL "")
-		set(example_output_name "${example_name}")
+		set(example_output_name ${example_name})
+		set(example_name "${example_prefix}.${example_name}")
 	else()
-		set(example_output_name "${example_output_relative_dir_name}.${example_name}")
+		set(example_output_name ${example_output_relative_dir_name}.${example_name})
+		set(example_name "${example_prefix}.${example_output_relative_dir_name}.${example_name}")
 	endif()
 
 	add_executable(${example_name} ${example_source_file})
-	set_target_properties(${example_name} 
+	set_target_properties(${example_name}
 		PROPERTIES
-		OUTPUT_NAME "${example_output_name}"
-		EXPORT_NAME sol2::${example_output_name})
+		OUTPUT_NAME "${example_output_name}")
 	
 	if (MSVC)
 		target_compile_options(${example_name}
@@ -98,12 +87,8 @@ function (MAKE_EXAMPLE example_source_file example_suffix target_sol)
 		endif()
 	endif()
 	
-	target_link_libraries(${example_name} 
-		PRIVATE Threads::Threads ${target_sol} ${LUA_LIBRARIES} sol2::assert)
-	
-	if(CMAKE_DL_LIBS)
-		target_link_libraries(${example_name} PRIVATE ${CMAKE_DL_LIBS})
-	endif()
+	target_link_libraries(${example_name}
+		PRIVATE Threads::Threads ${target_sol} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS})
 	
 	if (SOL2_TESTS_EXAMPLES)
 		add_test(NAME ${example_output_name} COMMAND ${example_name})
@@ -114,19 +99,19 @@ function (MAKE_EXAMPLE example_source_file example_suffix target_sol)
 endfunction(MAKE_EXAMPLE)
 
 if (SOL2_EXAMPLES)
-	foreach(example_source_file ${EXAMPLES_SRC})
-		MAKE_EXAMPLE(${example_source_file} "" sol2::sol2)
+	foreach(example_source_file ${sol2.examples.sources})
+		MAKE_EXAMPLE(${example_source_file} "sol2" sol2::sol2)
 	endforeach()
 endif()
 
 if (SOL2_EXAMPLES_SINGLE)
-	foreach(example_source_file ${EXAMPLES_SRC})
-		MAKE_EXAMPLE(${example_source_file} ".single" sol2::sol2_single)
+	foreach(example_source_file ${sol2.examples.sources})
+		MAKE_EXAMPLE(${example_source_file} "sol2.single" sol2::sol2::single)
 	endforeach()
 endif()
 
 if (SOL2_EXAMPLES_SINGLE_GENERATED)
-	foreach(example_source_file ${EXAMPLES_SRC})
-		MAKE_EXAMPLE(${example_source_file} ".single.generated" sol2::sol2_single_generated)
+	foreach(example_source_file ${sol2.examples.sources})
+		MAKE_EXAMPLE(${example_source_file} "sol2.single.generated" sol2::sol2::single_generated)
 	endforeach()
 endif()
diff --git a/examples/customization/CMakeLists.txt b/examples/customization/CMakeLists.txt
index 8f7e4d22..3b322d42 100644
--- a/examples/customization/CMakeLists.txt
+++ b/examples/customization/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -60,9 +60,9 @@ if (SOL2_EXAMPLES)
 endif()
 
 if (SOL2_EXAMPLES_SINGLE)
-	MAKE_CUSTOMIZATION_EXAMPLE(".single" sol2::sol2_single)
+	MAKE_CUSTOMIZATION_EXAMPLE(".single" sol2::sol2::single)
 endif()
 
 if (SOL2_EXAMPLES_SINGLE_GENERATED)
-	MAKE_CUSTOMIZATION_EXAMPLE(".single.generated" sol2::sol2_single_generated)
+	MAKE_CUSTOMIZATION_EXAMPLE(".single.generated" sol2::sol2::single_generated)
 endif()
\ No newline at end of file
diff --git a/examples/customization/source/lua_zm_interop.cpp b/examples/customization/source/lua_zm_interop.cpp
index f55bac51..25a09fe0 100644
--- a/examples/customization/source/lua_zm_interop.cpp
+++ b/examples/customization/source/lua_zm_interop.cpp
@@ -16,7 +16,7 @@ zm::vec3 sol_lua_get(sol::types<zm::vec3>, lua_State* L, int index, sol::stack::
 	float x = vec3table["x"];
 	float y = vec3table["y"];
 	float z = vec3table["z"];
-	return zm::vec3{ x, y, z };
+	return zm::vec3 { x, y, z };
 }
 
 int sol_lua_push(sol::types<zm::vec3>, lua_State* L, const zm::vec3& v) {
diff --git a/examples/customization/source/main.cpp b/examples/customization/source/main.cpp
index eb6f43d0..6c6400c3 100644
--- a/examples/customization/source/main.cpp
+++ b/examples/customization/source/main.cpp
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	std::cout << "=== customization: vec3 as table ===" << std::endl;
 
 	sol::state lua;
diff --git a/examples/include/assert.hpp b/examples/include/assert.hpp
deleted file mode 100644
index 4b7df808..00000000
--- a/examples/include/assert.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef EXAMPLES_ASSERT_HPP
-#define EXAMPLES_ASSERT_HPP
-
-#ifdef SOL2_CI
-struct pre_main {
-	pre_main() {
-		#ifdef _MSC_VER
-		_set_abort_behavior(0, _WRITE_ABORT_MSG);
-		#endif
-	}
-} pm;
-#endif // Prevent lockup when doing Continuous Integration
-
-#ifndef NDEBUG
-#include <exception>
-#include <iostream>
-#include <cstdlib>
-
-#   define m_assert(condition, message) \
-    do { \
-        if (! (condition)) { \
-            std::cerr << "Assertion `" #condition "` failed in " << __FILE__ \
-                      << " line " << __LINE__ << ": " << message << std::endl; \
-            std::terminate(); \
-        } \
-    } while (false)
-
-#   define c_assert(condition) \
-    do { \
-        if (! (condition)) { \
-            std::cerr << "Assertion `" #condition "` failed in " << __FILE__ \
-                      << " line " << __LINE__ << std::endl; \
-            std::terminate(); \
-        } \
-    } while (false)
-#else
-#   define m_assert(condition, message) do { if (false) { (void)(condition); (void)sizeof(message); } } while (false)
-#   define c_assert(condition) do { if (false) { (void)(condition); } } while (false)
-#endif
-
-#endif // EXAMPLES_ASSERT_HPP
diff --git a/examples/interop/LuaBridge/CMakeLists.txt b/examples/interop/LuaBridge/CMakeLists.txt
index 3a5a502d..e4117f18 100644
--- a/examples/interop/LuaBridge/CMakeLists.txt
+++ b/examples/interop/LuaBridge/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -31,7 +31,7 @@ function (make_luabridge_interop_example target_library example_suffix)
 	add_executable(${example_name} source/LuaBridge.cpp)
 	target_link_libraries(${example_name} 
 		PRIVATE ${LUA_LIBRARIES} ${LUABRIDGE_LIBRARIES} 
-		${target_library} sol2::assert)
+		${target_library} ${CMAKE_DL_LIBS})
 
 	if (MSVC)
 		target_compile_options(${example_name}
@@ -49,10 +49,6 @@ function (make_luabridge_interop_example target_library example_suffix)
 			-Wno-unknown-warning -Wno-unknown-warning-option)
 	endif()
 
-	if (CMAKE_DL_LIBS)
-		target_link_libraries(${example_name} PRIVATE ${CMAKE_DL_LIBS})
-	endif()
-
 	if (SOL2_TESTS_INTEROP_EXAMPLES)
 		add_test(NAME ${example_name} COMMAND ${example_name})
 	endif()
@@ -62,8 +58,8 @@ if (SOL2_INTEROP_EXAMPLES)
 	make_luabridge_interop_example(sol2::sol2 "")
 endif()
 if (SOL2_INTEROP_EXAMPLES_SINGLE)
-	make_luabridge_interop_example(sol2::sol2_single ".single")
+	make_luabridge_interop_example(sol2::sol2::single ".single")
 endif()
 if (SOL2_INTEROP_EXAMPLES_SINGLE_GENERATED)
-	make_luabridge_interop_example(sol2::sol2_single_generated ".single.generated")
+	make_luabridge_interop_example(sol2::sol2::single_generated ".single.generated")
 endif()
diff --git a/examples/interop/LuaBridge/source/LuaBridge.cpp b/examples/interop/LuaBridge/source/LuaBridge.cpp
index 81a9199b..5436f63b 100644
--- a/examples/interop/LuaBridge/source/LuaBridge.cpp
+++ b/examples/interop/LuaBridge/source/LuaBridge.cpp
@@ -5,7 +5,6 @@
 #include <LuaBridge/LuaBridge.h>
 
 #include <iostream>
-#include <assert.hpp>
 
 // LuaBridge,
 // no longer maintained, by VinnieFalco:
@@ -13,8 +12,7 @@
 
 struct A {
 
-	A(int v)
-	: v_(v) {
+	A(int v) : v_(v) {
 	}
 
 	void print() {
@@ -57,25 +55,26 @@ void register_sol_stuff(lua_State* L) {
 	sol::state_view lua(L);
 	// bind and set up your things: everything is entirely self-contained
 	lua["f"] = sol::overload(
-		[](A& from_luabridge) {
-			std::cout << "calling 1-argument version with luabridge-created A { " << from_luabridge.value() << " }" << std::endl;
-			c_assert(from_luabridge.value() == 24);
-		},
-		[](A& from_luabridge, int second_arg) {
-			std::cout << "calling 2-argument version with luabridge-created A { " << from_luabridge.value() << " } and integer argument of " << second_arg << std::endl;
-			c_assert(from_luabridge.value() == 24);
-			c_assert(second_arg == 5);
-		});
+	     [](A& from_luabridge) {
+		     std::cout << "calling 1-argument version with luabridge-created A { " << from_luabridge.value() << " }" << std::endl;
+		     sol_c_assert(from_luabridge.value() == 24);
+	     },
+	     [](A& from_luabridge, int second_arg) {
+		     std::cout << "calling 2-argument version with luabridge-created A { " << from_luabridge.value() << " } and integer argument of " << second_arg
+		               << std::endl;
+		     sol_c_assert(from_luabridge.value() == 24);
+		     sol_c_assert(second_arg == 5);
+	     });
 }
 
 void check_with_sol(lua_State* L) {
 	sol::state_view lua(L);
 	A& obj = lua["obj"];
 	(void)obj;
-	c_assert(obj.value() == 24);
+	sol_c_assert(obj.value() == 24);
 }
 
-int main(int, char* []) {
+int main(int, char*[]) {
 
 	std::cout << "=== interop example (LuaBridge) ===" << std::endl;
 	std::cout << "code modified from LuaBridge's examples: https://github.com/vinniefalco/LuaBridge" << std::endl;
@@ -89,15 +88,15 @@ int main(int, char* []) {
 	std::unique_ptr<lua_State, closer> state(luaL_newstate());
 	lua_State* L = state.get();
 	luaL_openlibs(L);
-	
+
 	luabridge::getGlobalNamespace(L)
-		.beginNamespace("test")
-		.beginClass<A>("A")
-		.addConstructor<void (*)(int)>()
-		.addFunction("print", &A::print)
-		.addFunction("value", &A::value)
-		.endClass()
-		.endNamespace();
+	     .beginNamespace("test")
+	     .beginClass<A>("A")
+	     .addConstructor<void (*)(int)>()
+	     .addFunction("print", &A::print)
+	     .addFunction("value", &A::value)
+	     .endClass()
+	     .endNamespace();
 
 	register_sol_stuff(L);
 
diff --git a/examples/interop/kaguya/CMakeLists.txt b/examples/interop/kaguya/CMakeLists.txt
index 2f523427..2f710701 100644
--- a/examples/interop/kaguya/CMakeLists.txt
+++ b/examples/interop/kaguya/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -31,7 +31,7 @@ function (make_kaguya_interop_example target_library example_suffix)
 	add_executable(${example_name} source/kaguya.cpp)
 	target_link_libraries(${example_name} 
 		PRIVATE ${LUA_LIBRARIES} ${KAGUYA_LIBRARIES} 
-		${target_library} sol2::assert)
+		${target_library} ${CMAKE_DL_LIBS})
 	
 	if (MSVC)
 		target_compile_options(${example_name}
@@ -48,10 +48,6 @@ function (make_kaguya_interop_example target_library example_suffix)
 			-Wno-unknown-warning -Wno-unknown-warning-option)
 	endif()
 
-	if (CMAKE_DL_LIBS)
-		target_link_libraries(${example_name} PRIVATE ${CMAKE_DL_LIBS})
-	endif()
-	
 	if (SOL2_TESTS_INTEROP_EXAMPLES)
 		add_test(NAME ${example_name} COMMAND ${example_name})
 	endif()
@@ -61,8 +57,8 @@ if (SOL2_INTEROP_EXAMPLES)
 	make_kaguya_interop_example(sol2::sol2 "")
 endif()
 if (SOL2_INTEROP_EXAMPLES_SINGLE)
-	make_kaguya_interop_example(sol2::sol2_single ".single")
+	make_kaguya_interop_example(sol2::sol2::single ".single")
 endif()
 if (SOL2_INTEROP_EXAMPLES_SINGLE_GENERATED)
-	make_kaguya_interop_example(sol2::sol2_single_generated ".single.generated")
+	make_kaguya_interop_example(sol2::sol2::single_generated ".single.generated")
 endif()
diff --git a/examples/interop/kaguya/source/kaguya.cpp b/examples/interop/kaguya/source/kaguya.cpp
index 638842e7..a2c87475 100644
--- a/examples/interop/kaguya/source/kaguya.cpp
+++ b/examples/interop/kaguya/source/kaguya.cpp
@@ -2,10 +2,7 @@
 #define SOL_ENABLE_INTEROP 1 // MUST be defined to use interop features
 #include <sol/sol.hpp>
 
-#include <kaguya/kaguya.hpp>
-
 #include <iostream>
-#include <assert.hpp>
 
 // kaguya code lifted from README.md,
 // written by satoren:
@@ -77,13 +74,13 @@ void register_sol_stuff(lua_State* L) {
 	lua["f"] = sol::overload(
 	     [](ABC& from_kaguya) {
 		     std::cout << "calling 1-argument version with kaguya-created ABC { " << from_kaguya.value() << " }" << std::endl;
-		     c_assert(from_kaguya.value() == 24);
+		     sol_c_assert(from_kaguya.value() == 24);
 	     },
 	     [](ABC& from_kaguya, int second_arg) {
 		     std::cout << "calling 2-argument version with kaguya-created ABC { " << from_kaguya.value() << " } and integer argument of " << second_arg
 		               << std::endl;
-		     c_assert(from_kaguya.value() == 24);
-		     c_assert(second_arg == 5);
+		     sol_c_assert(from_kaguya.value() == 24);
+		     sol_c_assert(second_arg == 5);
 	     });
 }
 
@@ -91,7 +88,7 @@ void check_with_sol(lua_State* L) {
 	sol::state_view lua(L);
 	ABC& obj = lua["obj"];
 	(void)obj;
-	c_assert(obj.value() == 24);
+	sol_c_assert(obj.value() == 24);
 }
 
 int main(int, char*[]) {
diff --git a/examples/interop/luwra/CMakeLists.txt b/examples/interop/luwra/CMakeLists.txt
index 83b02898..66a89262 100644
--- a/examples/interop/luwra/CMakeLists.txt
+++ b/examples/interop/luwra/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -31,7 +31,7 @@ function (make_luwra_interop_example target_library example_suffix)
 	add_executable(${example_name} source/luwra.cpp)
 	target_link_libraries(${example_name} 
 		PRIVATE ${LUA_LIBRARIES} ${LUWRA_LIBRARIES} 
-		${target_library} sol2::assert)
+		${target_library} ${CMAKE_DL_LIBS})
 
 	if (MSVC)
 		target_compile_options(${example_name}
@@ -48,10 +48,6 @@ function (make_luwra_interop_example target_library example_suffix)
 			-Wno-unknown-warning -Wno-unknown-warning-option)
 	endif()
 
-	if (CMAKE_DL_LIBS)
-		target_link_libraries(${example_name} PRIVATE ${CMAKE_DL_LIBS})
-	endif()
-
 	if (SOL2_TESTS_INTEROP_EXAMPLES)
 		add_test(NAME ${example_name} COMMAND ${example_name})
 	endif()
@@ -61,8 +57,8 @@ if (SOL2_INTEROP_EXAMPLES)
 	make_luwra_interop_example(sol2::sol2 "")
 endif()
 if (SOL2_INTEROP_EXAMPLES_SINGLE)
-	make_luwra_interop_example(sol2::sol2_single ".single")
+	make_luwra_interop_example(sol2::sol2::single ".single")
 endif()
 if (SOL2_INTEROP_EXAMPLES_SINGLE_GENERATED)
-	make_luwra_interop_example(sol2::sol2_single_generated ".single.generated")
+	make_luwra_interop_example(sol2::sol2::single_generated ".single.generated")
 endif()
\ No newline at end of file
diff --git a/examples/interop/luwra/source/luwra.cpp b/examples/interop/luwra/source/luwra.cpp
index 2a12f6ca..fa9e1ab3 100644
--- a/examples/interop/luwra/source/luwra.cpp
+++ b/examples/interop/luwra/source/luwra.cpp
@@ -5,18 +5,15 @@
 #include <luwra.hpp>
 
 #include <iostream>
-#include <assert.hpp>
 
 // luwra,
 // another C++ wrapper library:
 // https://github.com/vapourismo/luwra
 
 struct ABC {
-	ABC()
-	: v_(0) {
+	ABC() : v_(0) {
 	}
-	ABC(int value)
-	: v_(value) {
+	ABC(int value) : v_(value) {
 	}
 	int value() const {
 		return v_;
@@ -69,25 +66,26 @@ void register_sol_stuff(lua_State* L) {
 	sol::state_view lua(L);
 	// bind and set up your things: everything is entirely self-contained
 	lua["f"] = sol::overload(
-		[](ABC& from_luwra) {
-			std::cout << "calling 1-argument version with luwra-created ABC { " << from_luwra.value() << " }" << std::endl;
-			c_assert(from_luwra.value() == 24);
-		},
-		[](ABC& from_luwra, int second_arg) {
-			std::cout << "calling 2-argument version with luwra-created ABC { " << from_luwra.value() << " } and integer argument of " << second_arg << std::endl;
-			c_assert(from_luwra.value() == 24);
-			c_assert(second_arg == 5);
-		});
+	     [](ABC& from_luwra) {
+		     std::cout << "calling 1-argument version with luwra-created ABC { " << from_luwra.value() << " }" << std::endl;
+		     sol_c_assert(from_luwra.value() == 24);
+	     },
+	     [](ABC& from_luwra, int second_arg) {
+		     std::cout << "calling 2-argument version with luwra-created ABC { " << from_luwra.value() << " } and integer argument of " << second_arg
+		               << std::endl;
+		     sol_c_assert(from_luwra.value() == 24);
+		     sol_c_assert(second_arg == 5);
+	     });
 }
 
 void check_with_sol(lua_State* L) {
 	sol::state_view lua(L);
 	ABC& obj = lua["obj"];
 	(void)obj;
-	c_assert(obj.value() == 24);
+	sol_c_assert(obj.value() == 24);
 }
 
-int main(int, char* []) {
+int main(int, char*[]) {
 
 	std::cout << "=== interop example (luwra) ===" << std::endl;
 	std::cout << "code modified from luwra's documentation examples: https://github.com/vapourismo/luwra" << std::endl;
diff --git a/examples/interop/tolua/CMakeLists.txt b/examples/interop/tolua/CMakeLists.txt
index cc883fcb..db72feb5 100644
--- a/examples/interop/tolua/CMakeLists.txt
+++ b/examples/interop/tolua/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -30,8 +30,8 @@ function(make_tolua_interop_example target_library example_suffix)
 
 	add_executable(${example_name} source/tolua.cpp)
 	target_link_libraries(${example_name} 
-		PRIVATE sol2::assert
-		${LUA_LIBRARIES} ${TOLUAPP_LIBRARIES} ${target_library})
+		PRIVATE
+		${LUA_LIBRARIES} ${TOLUAPP_LIBRARIES} ${target_library} ${CMAKE_DL_LIBS})
 	
 	if (MSVC)
 		target_compile_options(${example_name}
@@ -48,10 +48,6 @@ function(make_tolua_interop_example target_library example_suffix)
 			-Wno-unknown-warning -Wno-unknown-warning-option)
 	endif()
 	
-	if (CMAKE_DL_LIBS)
-		target_link_libraries(${example_name} PRIVATE ${CMAKE_DL_LIBS})
-	endif()
-
 	if (SOL2_TESTS_INTEROP_EXAMPLES)
 		add_test(NAME ${example_name} COMMAND ${example_name})
 	endif()
@@ -63,8 +59,8 @@ if (SOL2_INTEROP_EXAMPLES)
 	make_tolua_interop_example(sol2::sol2 "")
 endif()
 if (SOL2_INTEROP_EXAMPLES_SINGLE)
-	make_tolua_interop_example(sol2::sol2_single ".single")
+	make_tolua_interop_example(sol2::sol2::single ".single")
 endif()
 if (SOL2_INTEROP_EXAMPLES_SINGLE_GENERATED)
-	make_tolua_interop_example(sol2::sol2_single_generated ".single.generated")
+	make_tolua_interop_example(sol2::sol2::single_generated ".single.generated")
 endif()
diff --git a/examples/interop/tolua/source/tolua.cpp b/examples/interop/tolua/source/tolua.cpp
index d413e270..19ebfc8e 100644
--- a/examples/interop/tolua/source/tolua.cpp
+++ b/examples/interop/tolua/source/tolua.cpp
@@ -9,7 +9,6 @@
 #include "tolua_Player.h"
 
 #include <iostream>
-#include <assert.hpp>
 
 // tolua code lifted from some blog, if the link dies
 // I don't know where else you're gonna find the reference,
@@ -29,7 +28,7 @@ inline bool sol_lua_interop_check(sol::types<T>, lua_State* L, int relindex, sol
 	(void)handler;
 	int index = lua_absindex(L, relindex);
 	std::string name = sol::detail::short_demangle<T>();
-	tolua_Error tolua_err{};
+	tolua_Error tolua_err {};
 	int r = tolua_isusertype(L, index, name.c_str(), 0, &tolua_err);
 	if (r == 0) {
 		// tolua seems to leave garbage on the stack
@@ -47,33 +46,34 @@ void register_sol_stuff(lua_State* L) {
 	sol::state_view lua(L);
 	// bind and set up your things: everything is entirely self-contained
 	lua["f"] = sol::overload(
-		[](Player& from_tolua) {
-			std::cout << "calling 1-argument version with tolua-created Player { health:" << from_tolua.getHealth() << " }" << std::endl;
-			c_assert(from_tolua.getHealth() == 4);
-		},
-		[](Player& from_tolua, int second_arg) {
-			std::cout << "calling 2-argument version with tolua-created Player { health: " << from_tolua.getHealth() << " } and integer argument of " << second_arg << std::endl;
-			c_assert(from_tolua.getHealth() == 4);
-			c_assert(second_arg == 5);
-		});
+	     [](Player& from_tolua) {
+		     std::cout << "calling 1-argument version with tolua-created Player { health:" << from_tolua.getHealth() << " }" << std::endl;
+		     sol_c_assert(from_tolua.getHealth() == 4);
+	     },
+	     [](Player& from_tolua, int second_arg) {
+		     std::cout << "calling 2-argument version with tolua-created Player { health: " << from_tolua.getHealth() << " } and integer argument of "
+		               << second_arg << std::endl;
+		     sol_c_assert(from_tolua.getHealth() == 4);
+		     sol_c_assert(second_arg == 5);
+	     });
 }
 
 void check_with_sol(lua_State* L) {
 	sol::state_view lua(L);
 	Player& obj = lua["obj"];
 	(void)obj;
-	c_assert(obj.getHealth() == 4);
+	sol_c_assert(obj.getHealth() == 4);
 }
 
-int main(int, char* []) {
+int main(int, char*[]) {
 
 	std::cout << "=== interop example (tolua) ===" << std::endl;
 	std::cout << "(code lifted from a sol2 user's use case: https://github.com/ThePhD/sol2/issues/511#issuecomment-331729884)" << std::endl;
 
 	lua_State* L = luaL_newstate();
 
-	luaL_openlibs(L);	// initalize all lua standard library functions
-	tolua_open(L);		  // initalize tolua
+	luaL_openlibs(L);     // initalize all lua standard library functions
+	tolua_open(L);        // initalize tolua
 	tolua_Player_open(L); // make Player class accessible from LUA
 
 
diff --git a/examples/require_dll_example/CMakeLists.txt b/examples/require_dll_example/CMakeLists.txt
index eb5f9424..8ad817ac 100644
--- a/examples/require_dll_example/CMakeLists.txt
+++ b/examples/require_dll_example/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -45,9 +45,9 @@ function(make_require_from_dll_example target_lib example_lib_name_suffix)
 	target_compile_definitions(${example_lib_name} 
 		PUBLIC MY_OBJECT_DLL 
 		PRIVATE MY_OBJECT_BUILD)
-	target_link_libraries(${example_lib_name} 
-		PUBLIC ${target_lib} ${LUA_LIBRARIES} sol2::assert)
-	target_include_directories(${example_lib_name} 
+	target_link_libraries(${example_lib_name}
+		PUBLIC ${target_lib} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS})
+	target_include_directories(${example_lib_name}
 		PUBLIC "${LUA_INCLUDE_DIRS}")
 	
 	if (MSVC)
@@ -80,15 +80,11 @@ function(make_require_from_dll_example target_lib example_lib_name_suffix)
 		endif()
 	endif()
 
-	if(CMAKE_DL_LIBS)
-		target_link_libraries(${example_lib_name} PUBLIC ${CMAKE_DL_LIBS})
-	endif()
-	
 	# add executable target that represents require_from_dll program
 	add_executable(${example_name} ${require_from_dll_sources})
-	target_link_libraries(${example_name} 
-		PRIVATE my_object ${LUA_LIBRARIES} ${target_lib})
-	target_include_directories(${example_name} 
+	target_link_libraries(${example_name}
+		PRIVATE my_object ${LUA_LIBRARIES} ${target_lib} ${CMAKE_DL_LIBS})
+	target_include_directories(${example_name}
 		PRIVATE ${LUA_INCLUDE_DIRS})
 
 	if (MSVC)
@@ -115,10 +111,6 @@ function(make_require_from_dll_example target_lib example_lib_name_suffix)
 			#	PRIVATE -Wcomma)		
 		endif()
 	endif()
-
-	if(CMAKE_DL_LIBS)
-		target_link_libraries(${example_name} PRIVATE ${CMAKE_DL_LIBS})
-	endif()
 	
 	if (SOL2_TESTS_DYNAMIC_LOADING_EXAMPLES)
 		get_target_property(example_working_dir ${example_name} RUNTIME_OUTPUT_DIRECTORY)
@@ -138,8 +130,8 @@ if (SOL2_DYNAMIC_LOADING_EXAMPLES)
 	make_require_from_dll_example(sol2::sol2 "")
 endif()
 if (SOL2_DYNAMIC_LOADING_EXAMPLES_SINGLE)
-	make_require_from_dll_example(sol2::sol2_single ".single")
+	make_require_from_dll_example(sol2::sol2::single ".single")
 endif()
 if (SOL2_DYNAMIC_LOADING_EXAMPLES_SINGLE_GENERATED)
-	make_require_from_dll_example(sol2::sol2_single_generated ".single.generated")
+	make_require_from_dll_example(sol2::sol2::single_generated ".single.generated")
 endif()
diff --git a/examples/require_dll_example/include/my_object/my_object.hpp b/examples/require_dll_example/include/my_object/my_object.hpp
index f8ec5e5c..19638b26 100644
--- a/examples/require_dll_example/include/my_object/my_object.hpp
+++ b/examples/require_dll_example/include/my_object/my_object.hpp
@@ -2,12 +2,12 @@
 
 #include <my_object/my_object_api.hpp>
 
-// forward declare as a C struct 
+// forward declare as a C struct
 // so a pointer to lua_State can be part of a signature
 extern "C" {
-	struct lua_State;
+struct lua_State;
 }
-// you can replace the above if you're fine with including 
+// you can replace the above if you're fine with including
 // <sol.hpp> earlier than absolutely necessary
 
 namespace my_object {
@@ -16,7 +16,8 @@ namespace my_object {
 		int value;
 
 		test() = default;
-		test(int val) : value(val) {}
+		test(int val) : value(val) {
+		}
 	};
 
 } // namespace my_object
diff --git a/examples/require_dll_example/include/my_object/my_object_api.hpp b/examples/require_dll_example/include/my_object/my_object_api.hpp
index 6af5f423..96cc71f2 100644
--- a/examples/require_dll_example/include/my_object/my_object_api.hpp
+++ b/examples/require_dll_example/include/my_object/my_object_api.hpp
@@ -3,25 +3,25 @@
 namespace my_object {
 
 #if defined _MSC_VER
-	#define MY_OBJECT_VC
+#define MY_OBJECT_VC
 #elif defined __GNUC__
-	#define MY_OBJECT_GCC
+#define MY_OBJECT_GCC
 #elif defined __clang__
-	#define MY_OBJECT_CLANG
+#define MY_OBJECT_CLANG
 #endif
 
 #if defined MY_OBJECT_VC
-	#if defined MY_OBJECT_DLL
-		#if defined MY_OBJECT_BUILD
-			#define MY_OBJECT_API __declspec(dllexport)
-		#else
-			#define MY_OBJECT_API __declspec(dllexport)
-		#endif // MY_OBJECT_BUILD - Building the Library vs. Using the Library
-	#else
-		#define MY_OBJECT_API 
-	#endif // Building a DLL vs. Static Library
-#else // g++ / clang++
-	#define MY_OBJECT_API __attribute__ ((visibility ("default")))
+#if defined MY_OBJECT_DLL
+#if defined MY_OBJECT_BUILD
+#define MY_OBJECT_API __declspec(dllexport)
+#else
+#define MY_OBJECT_API __declspec(dllexport)
+#endif // MY_OBJECT_BUILD - Building the Library vs. Using the Library
+#else
+#define MY_OBJECT_API
+#endif // Building a DLL vs. Static Library
+#else  // g++ / clang++
+#define MY_OBJECT_API __attribute__((visibility("default")))
 #endif // MY_OBJECT_BUILD
 
 } // namespace my_object
diff --git a/examples/require_dll_example/source/my_object.cpp b/examples/require_dll_example/source/my_object.cpp
index d966c2b7..96ec9f3e 100644
--- a/examples/require_dll_example/source/my_object.cpp
+++ b/examples/require_dll_example/source/my_object.cpp
@@ -8,9 +8,7 @@ namespace my_object {
 	sol::table open_my_object(sol::this_state L) {
 		sol::state_view lua(L);
 		sol::table module = lua.create_table();
-		module.new_usertype<test>("test",
-			sol::constructors<test(), test(int)>(),
-			"value", &test::value);
+		module.new_usertype<test>("test", sol::constructors<test(), test(int)>(), "value", &test::value);
 
 		return module;
 	}
@@ -23,5 +21,5 @@ extern "C" int luaopen_my_object(lua_State* L) {
 	// and the function itself
 	// optionally, you can pass extra arguments to the function if that's necessary,
 	// but that's advanced usage and is generally reserved for internals only
-	return sol::stack::call_lua(L, 1, my_object::open_my_object );
+	return sol::stack::call_lua(L, 1, my_object::open_my_object);
 }
diff --git a/examples/require_dll_example/source/require_from_dll.cpp b/examples/require_dll_example/source/require_from_dll.cpp
index 874d187a..d6d59127 100644
--- a/examples/require_dll_example/source/require_from_dll.cpp
+++ b/examples/require_dll_example/source/require_from_dll.cpp
@@ -2,7 +2,6 @@
 #include <sol/sol.hpp>
 
 #include <my_object/my_object.hpp>
-#include <assert.hpp>
 
 #include <iostream>
 
@@ -25,9 +24,9 @@ print(obj.value))";
 		sol::error err = script_result;
 		std::cout << "Something bad happened: " << err.what() << std::endl;
 	}
-	c_assert(script_result.valid());
+	sol_c_assert(script_result.valid());
 	my_object::test& obj = lua["obj"];
-	c_assert(obj.value == 24);
+	sol_c_assert(obj.value == 24);
 
 	return 0;
 }
\ No newline at end of file
diff --git a/examples/source/any_return.cpp b/examples/source/any_return.cpp
index 11c84717..0c1384a0 100644
--- a/examples/source/any_return.cpp
+++ b/examples/source/any_return.cpp
@@ -2,7 +2,6 @@
 #include <sol/sol.hpp>
 
 #include <iostream>
-#include "assert.hpp"
 
 // Uses some of the fancier bits of sol3, including the "transparent argument",
 // sol::this_state, which gets the current state and does not increment
@@ -27,18 +26,18 @@ int main() {
 
 	int result = lua["f"](1, 2);
 	// result == 3
-	c_assert(result == 3);
+	sol_c_assert(result == 3);
 	double result2 = lua["f"](false, 2.5);
 	// result2 == 2.5
-	c_assert(result2 == 2.5);
+	sol_c_assert(result2 == 2.5);
 
 	// call in Lua, get result
 	// notice we only need 2 arguments here, not 3 (sol::this_state is transparent)
 	lua.script("result3 = f(true, 5.5)");
 	double result3 = lua["result3"];
 	// result3 == 16.5
-	c_assert(result3 == 16.5);
-	
+	sol_c_assert(result3 == 16.5);
+
 	std::cout << "=== any_return ===" << std::endl;
 	std::cout << "result : " << result << std::endl;
 	std::cout << "result2: " << result2 << std::endl;
diff --git a/examples/source/args_from_container.cpp b/examples/source/args_from_container.cpp
index 0e310d89..70c16e33 100644
--- a/examples/source/args_from_container.cpp
+++ b/examples/source/args_from_container.cpp
@@ -5,8 +5,8 @@
 #include <vector>
 #include <set>
 
-int main(int , const char*[]) {
-	
+int main(int, const char*[]) {
+
 	std::cout << "=== args_from_container ===" << std::endl;
 
 	sol::state lua;
@@ -16,10 +16,10 @@ int main(int , const char*[]) {
 
 	sol::function f = lua["f"];
 
-	std::vector<int> v2{ 3, 4 };
+	std::vector<int> v2 { 3, 4 };
 	f(1, 2, sol::as_args(v2));
 
-	std::set<int> v4{ 3, 1, 2, 4 };
+	std::set<int> v4 { 3, 1, 2, 4 };
 	f(sol::as_args(v4));
 
 	int v3[] = { 2, 3, 4 };
diff --git a/examples/source/as_returns.cpp b/examples/source/as_returns.cpp
index 1c2e759b..02a51939 100644
--- a/examples/source/as_returns.cpp
+++ b/examples/source/as_returns.cpp
@@ -1,28 +1,27 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 #include <string>
 #include <set>
 
-int main () {
+int main() {
 	sol::state lua;
 
 	lua.set_function("f", []() {
-		std::set<std::string> results{ "arf", "bark", "woof" };
+		std::set<std::string> results { "arf", "bark", "woof" };
 		return sol::as_returns(std::move(results));
 	});
-	
+
 	lua.script("v1, v2, v3 = f()");
 
 	std::string v1 = lua["v1"];
 	std::string v2 = lua["v2"];
 	std::string v3 = lua["v3"];
 
-	c_assert(v1 == "arf");
-	c_assert(v2 == "bark");
-	c_assert(v3 == "woof");
+	sol_c_assert(v1 == "arf");
+	sol_c_assert(v2 == "bark");
+	sol_c_assert(v3 == "woof");
 
-	return 0;		
+	return 0;
 }
diff --git a/examples/source/basic.cpp b/examples/source/basic.cpp
index aefb1e34..2314083c 100644
--- a/examples/source/basic.cpp
+++ b/examples/source/basic.cpp
@@ -2,7 +2,6 @@
 #include <sol/sol.hpp>
 
 #include <iostream>
-#include "assert.hpp"
 
 int main() {
 	std::cout << "=== basic ===" << std::endl;
@@ -14,7 +13,7 @@ int main() {
 	// the libraries reside in the sol::lib enum class
 	lua.open_libraries(sol::lib::base);
 	// you can open all libraries by passing no arguments
-	//lua.open_libraries();
+	// lua.open_libraries();
 
 	// call lua code directly
 	lua.script("print('hello world')");
@@ -32,25 +31,25 @@ int main() {
 	// the above lambda is identical to sol::simple_on_error, but it's
 	// shown here to show you can write whatever you like
 
-	// 
+	//
 	{
 		auto result = lua.script("print('hello hello again, world') \n return 24", simple_handler);
 		if (result.valid()) {
 			std::cout << "the third script worked, and a double-hello statement should appear above this one!" << std::endl;
 			int value = result;
-			c_assert(value == 24);
+			sol_c_assert(value == 24);
 		}
 		else {
 			std::cout << "the third script failed, check the result type for more information!" << std::endl;
 		}
 	}
 
-	{ 
+	{
 		auto result = lua.script("does.not.exist", simple_handler);
 		if (result.valid()) {
 			std::cout << "the fourth script worked, which it wasn't supposed to! Panic!" << std::endl;
 			int value = result;
-			c_assert(value == 24);
+			sol_c_assert(value == 24);
 		}
 		else {
 			sol::error err = result;
@@ -59,6 +58,6 @@ int main() {
 	}
 
 	std::cout << std::endl;
-	
+
 	return 0;
 }
diff --git a/examples/source/c_array.cpp b/examples/source/c_array.cpp
index 084c04d6..79d72f52 100644
--- a/examples/source/c_array.cpp
+++ b/examples/source/c_array.cpp
@@ -1,14 +1,14 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 #include <iostream>
 
 struct something {
 	int arr[4];
 
-	something() : arr{ 5, 6, 7, 8 } {}
+	something() : arr { 5, 6, 7, 8 } {
+	}
 };
 
 int main() {
@@ -18,11 +18,7 @@ int main() {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	lua.new_usertype<something>("something",
-		"arr", sol::property([](something& s) {
-			return std::ref(s.arr);
-		})
-	);
+	lua.new_usertype<something>("something", "arr", sol::property([](something& s) { return std::ref(s.arr); }));
 	lua.script(R"(s = something.new() 
 		print(s.arr[3])
 		s.arr[3] = 40
@@ -30,10 +26,10 @@ int main() {
 	)");
 
 	something& s = lua["s"];
-	c_assert(s.arr[0] == 5);
-	c_assert(s.arr[1] == 6);
-	c_assert(s.arr[2] == 40);
-	c_assert(s.arr[3] == 8);
+	sol_c_assert(s.arr[0] == 5);
+	sol_c_assert(s.arr[1] == 6);
+	sol_c_assert(s.arr[2] == 40);
+	sol_c_assert(s.arr[3] == 8);
 
 	std::string string_array[] = {
 		"first string",
@@ -49,7 +45,7 @@ int main() {
 		print(str_arr[3])
 	)");
 
-	c_assert(string_array[2] == "third string: modified");
+	sol_c_assert(string_array[2] == "third string: modified");
 
 	return 0;
 }
diff --git a/examples/source/c_call.cpp b/examples/source/c_call.cpp
index 47587052..b7e7a97a 100644
--- a/examples/source/c_call.cpp
+++ b/examples/source/c_call.cpp
@@ -1,11 +1,13 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
+int f1(int) {
+	return 32;
+}
 
-int f1(int) { return 32; }
-
-int f2(int, int) { return 1; }
+int f2(int, int) {
+	return 1;
+}
 
 struct fer {
 	double f3(int, int) {
@@ -13,7 +15,6 @@ struct fer {
 	}
 };
 
-
 int main() {
 
 	sol::state lua;
@@ -36,15 +37,15 @@ int main() {
 	// get the results and see
 	// if it worked out
 	int r1 = lua["r1"];
-	c_assert(r1 == 32);
+	sol_c_assert(r1 == 32);
 	int r2 = lua["r2"];
-	c_assert(r2 == 1);
+	sol_c_assert(r2 == 1);
 	double r3 = lua["r3"];
-	c_assert(r3 == 2.5);
+	sol_c_assert(r3 == 2.5);
 	int r4 = lua["r4"];
-	c_assert(r4 == 32);
+	sol_c_assert(r4 == 32);
 	int r5 = lua["r5"];
-	c_assert(r5 == 1);
+	sol_c_assert(r5 == 1);
 
 	return 0;
 }
diff --git a/examples/source/config.cpp b/examples/source/config.cpp
index 883696b4..bc245436 100644
--- a/examples/source/config.cpp
+++ b/examples/source/config.cpp
@@ -1,29 +1,26 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <string>
 #include <iostream>
 
 // shows how to load basic data to a struct
 
 struct config {
-    std::string name;
-    int width;
-    int height;
+	std::string name;
+	int width;
+	int height;
 
-    void print() {
-        std::cout << "Name: "   << name   << '\n'
-                  << "Width: "  << width  << '\n'
-                  << "Height: " << height << '\n';
-    }
+	void print() {
+		std::cout << "Name: " << name << '\n' << "Width: " << width << '\n' << "Height: " << height << '\n';
+	}
 };
 
 int main() {
 	sol::state lua;
 	config screen;
 	// To use the file, uncomment here and make sure it is in local dir
-	//lua.script_file("config.lua");
+	// lua.script_file("config.lua");
 	lua.script(R"(
 name = "Asus"
 width = 1920
@@ -32,9 +29,9 @@ height = 1080
 	screen.name = lua.get<std::string>("name");
 	screen.width = lua.get<int>("width");
 	screen.height = lua.get<int>("height");
-	c_assert(screen.name == "Asus");
-	c_assert(screen.width == 1920);
-	c_assert(screen.height == 1080);
+	sol_c_assert(screen.name == "Asus");
+	sol_c_assert(screen.width == 1920);
+	sol_c_assert(screen.height == 1080);
 
 	std::cout << "=== config ===" << std::endl;
 	screen.print();
diff --git a/examples/source/container_usertype_as_container.cpp b/examples/source/container_usertype_as_container.cpp
index 20cbfbf3..2d3f3179 100644
--- a/examples/source/container_usertype_as_container.cpp
+++ b/examples/source/container_usertype_as_container.cpp
@@ -4,7 +4,6 @@
 #include <vector>
 #include <numeric>
 
-#include "assert.hpp"
 #include <iostream>
 
 class number_storage {
@@ -12,9 +11,11 @@ private:
 	std::vector<int> data;
 
 public:
-	number_storage(int i) { data.push_back(i); }
+	number_storage(int i) {
+		data.push_back(i);
+	}
 
-	int accumulate() const { 
+	int accumulate() const {
 		return std::accumulate(data.begin(), data.end(), 0);
 	}
 
@@ -22,18 +23,30 @@ public:
 	using value_type = decltype(data)::value_type;
 	using iterator = decltype(data)::iterator;
 	using size_type = decltype(data)::size_type;
-	iterator begin() { return iterator(data.begin()); }
-	iterator end() { return iterator(data.end()); }
-	size_type size() const noexcept { return data.size(); }
-	size_type max_size() const noexcept { return data.max_size(); }
-	void push_back(int value) { data.push_back(value); }
-	bool empty() const noexcept { return data.empty(); }
+	iterator begin() {
+		return iterator(data.begin());
+	}
+	iterator end() {
+		return iterator(data.end());
+	}
+	size_type size() const noexcept {
+		return data.size();
+	}
+	size_type max_size() const noexcept {
+		return data.max_size();
+	}
+	void push_back(int value) {
+		data.push_back(value);
+	}
+	bool empty() const noexcept {
+		return data.empty();
+	}
 };
 
 namespace sol {
 	template <>
-	struct is_container<number_storage> : std::false_type {};
-}
+	struct is_container<number_storage> : std::false_type { };
+} // namespace sol
 
 int main(int, char*[]) {
 	std::cout << "=== container as container ===" << std::endl;
@@ -41,13 +54,10 @@ int main(int, char*[]) {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	lua.new_usertype<number_storage>("number_storage",
-		sol::constructors<number_storage(int)>(),
-		"accumulate", &number_storage::accumulate,
-		"iterable", [](number_storage& ns) { 
-			return sol::as_container(ns); // treat like a container, despite is_container specialization
-		}
-	);
+	lua.new_usertype<number_storage>(
+	     "number_storage", sol::constructors<number_storage(int)>(), "accumulate", &number_storage::accumulate, "iterable", [](number_storage& ns) {
+		     return sol::as_container(ns); // treat like a container, despite is_container specialization
+	     });
 
 	lua.script(R"(
 ns = number_storage.new(23)
@@ -64,8 +74,8 @@ print("accumulate after :", ns:accumulate())
 
 	number_storage& ns = lua["ns"];
 	number_storage& ns_container = lua["ns_container"];
-	c_assert(&ns == &ns_container);
-	c_assert(ns.size() == 3);
+	sol_c_assert(&ns == &ns_container);
+	sol_c_assert(ns.size() == 3);
 
 	std::cout << std::endl;
 
diff --git a/examples/source/container_with_pairs.cpp b/examples/source/container_with_pairs.cpp
index 7651a68f..2fba8d67 100644
--- a/examples/source/container_with_pairs.cpp
+++ b/examples/source/container_with_pairs.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 #include <unordered_set>
 #include <iostream>
@@ -23,9 +22,7 @@ int main() {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	lua.set_function("f", []() {
-		return my_set{ { "key1", "value1" },{ "key2", "value2" },{ "key3", "value3" } };
-	});
+	lua.set_function("f", []() { return my_set { { "key1", "value1" }, { "key2", "value2" }, { "key3", "value3" } }; });
 
 	lua.safe_script("v = f()");
 	lua.safe_script("print('v:', v)");
diff --git a/examples/source/containers.cpp b/examples/source/containers.cpp
index 01bf420e..105e91f8 100644
--- a/examples/source/containers.cpp
+++ b/examples/source/containers.cpp
@@ -21,13 +21,13 @@ function f (x)
 end
 	)");
 
-	// Have the function we 
+	// Have the function we
 	// just defined in Lua
 	sol::function f = lua["f"];
 
-	// Set a global variable called 
+	// Set a global variable called
 	// "arr" to be a vector of 5 lements
-	lua["arr"] = std::vector<int>{ 2, 4, 6, 8, 10 };
+	lua["arr"] = std::vector<int> { 2, 4, 6, 8, 10 };
 
 	// Call it, see 5 elements
 	// printed out
@@ -57,7 +57,7 @@ arr:clear()
 
 	// Now it's empty
 	f(lua["arr"]);
-	
+
 	std::cout << std::endl;
 
 	return 0;
diff --git a/examples/source/containers_as_table.cpp b/examples/source/containers_as_table.cpp
index 5a0ce020..b60ba07a 100644
--- a/examples/source/containers_as_table.cpp
+++ b/examples/source/containers_as_table.cpp
@@ -3,7 +3,6 @@
 
 #include <vector>
 #include <map>
-#include "assert.hpp"
 #include <iostream>
 
 
@@ -15,13 +14,14 @@
 void demo(sol::nested<std::map<std::string, std::vector<std::string>>> src) {
 	std::cout << "demo, sol::nested<...>" << std::endl;
 	const auto& listmap = src.value();
-	c_assert(listmap.size() == 2);
+	sol_c_assert(listmap.size() == 2);
 	for (const auto& kvp : listmap) {
 		const std::vector<std::string>& strings = kvp.second;
-		c_assert(strings.size() == 3);
+		sol_c_assert(strings.size() == 3);
 		std::cout << "\t" << kvp.first << " = ";
 		for (const auto& s : strings) {
-			std::cout << "'" << s << "'" << " ";
+			std::cout << "'" << s << "'"
+			          << " ";
 		}
 		std::cout << std::endl;
 	}
@@ -30,23 +30,24 @@ void demo(sol::nested<std::map<std::string, std::vector<std::string>>> src) {
 
 // This second demo is equivalent to the first
 // Nota bene the signature here
-// Every container-type that's meant to be 
+// Every container-type that's meant to be
 // a table must be wrapped in `sol::as_table_t`
 // it's verbose, so feel free to use typedefs to make it easy on you
 // you can mix which parts are considered tables from Lua, and which parts
 // are considered other kinds of types, such as userdata and the like
-void demo_explicit (sol::as_table_t<std::map<std::string, sol::as_table_t<std::vector<std::string>>>> src) {
+void demo_explicit(sol::as_table_t<std::map<std::string, sol::as_table_t<std::vector<std::string>>>> src) {
 	std::cout << "demo, explicit sol::as_table_t<...>" << std::endl;
 	// Have to access the "source" member variable for as_table_t
 	const auto& listmap = src.value();
-	c_assert(listmap.size() == 2);
+	sol_c_assert(listmap.size() == 2);
 	for (const auto& kvp : listmap) {
 		// Have to access the internal "source" for the inner as_table_t, as well
 		const std::vector<std::string>& strings = kvp.second.value();
-		c_assert(strings.size() == 3);
+		sol_c_assert(strings.size() == 3);
 		std::cout << "\t" << kvp.first << " = ";
 		for (const auto& s : strings) {
-			std::cout << "'" << s << "'" << " ";
+			std::cout << "'" << s << "'"
+			          << " ";
 		}
 		std::cout << std::endl;
 	}
@@ -55,7 +56,7 @@ void demo_explicit (sol::as_table_t<std::map<std::string, sol::as_table_t<std::v
 
 int main(int, char**) {
 	std::cout << "=== containers retrieved from lua tables ===" << std::endl;
-	
+
 	sol::state lua;
 	// bind the function
 	lua.set_function("f", &demo);
diff --git a/examples/source/coroutine.cpp b/examples/source/coroutine.cpp
index 045bbe83..2f4a3736 100644
--- a/examples/source/coroutine.cpp
+++ b/examples/source/coroutine.cpp
@@ -14,30 +14,29 @@ int main() {
 
 	sol::thread runner_thread = sol::thread::create(lua);
 
-	lua.set_function("start_task",
-		[&runner_thread, &tasks](sol::function f, sol::variadic_args va) {
+	lua.set_function("start_task", [&runner_thread, &tasks](sol::function f, sol::variadic_args va) {
 		// You must ALWAYS get the current state
 		sol::state_view runner_thread_state = runner_thread.state();
 		// Put the task in our task list to keep it alive and track it
 		std::size_t task_index = tasks.size();
 		tasks.emplace_back(runner_thread_state, f);
 		sol::coroutine& f_on_runner_thread = tasks[task_index];
-		// call coroutine with arguments that came 
+		// call coroutine with arguments that came
 		// from main thread / other thread
 		// pusher for `variadic_args` and other sol types will transfer the
-		// arguments from the calling thread to 
+		// arguments from the calling thread to
 		// the runner thread automatically for you
 		// using `lua_xmove` internally
 		int wait = f_on_runner_thread(va);
 		std::cout << "First return: " << wait << std::endl;
-		// When you call it again, you don't need new arguments 
+		// When you call it again, you don't need new arguments
 		// (they remain the same from the first call)
 		f_on_runner_thread();
 		std::cout << "Second run complete: " << wait << std::endl;
 	});
 
 	lua.script(
-		R"(
+	     R"(
 function main(x, y, z)
 	-- do something
 	coroutine.yield(20)
@@ -53,8 +52,7 @@ end
 
 	start_task(main, 10, 12, 8)
 	start_task(main2, 1, 2)
-)"
-);
+)");
 
 	std::cout << std::endl;
 
diff --git a/examples/source/coroutine_multiple_stacks.cpp b/examples/source/coroutine_multiple_stacks.cpp
index c8b6d5ab..634585d9 100644
--- a/examples/source/coroutine_multiple_stacks.cpp
+++ b/examples/source/coroutine_multiple_stacks.cpp
@@ -4,18 +4,14 @@
 #include <string>
 #include <iostream>
 
-int main () {
+int main() {
 	std::cout << "=== coroutine - multple threads ===" << std::endl;
 
 	sol::state lua;
 	lua.open_libraries(sol::lib::base, sol::lib::package, sol::lib::coroutine);
 
-	lua["print"] = [](sol::object v){
-		std::cout << v.as<std::string>() << std::endl;
-	};
-	lua["cyield"] = sol::yielding([](){
-		std::cout << "YIELDING" << std::endl;
-	});
+	lua["print"] = [](sol::object v) { std::cout << v.as<std::string>() << std::endl; };
+	lua["cyield"] = sol::yielding([]() { std::cout << "YIELDING" << std::endl; });
 
 	// notice the new threads!
 	sol::thread thread1 = sol::thread::create(lua);
diff --git a/examples/source/coroutine_state.cpp b/examples/source/coroutine_state.cpp
index bcece881..bda47e52 100644
--- a/examples/source/coroutine_state.cpp
+++ b/examples/source/coroutine_state.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 
 int main(int, char*[]) {
@@ -42,7 +41,7 @@ int main(int, char*[]) {
 	transferred_into();
 	// check
 	int i = lua["i"];
-	c_assert(i == 1);
+	sol_c_assert(i == 1);
 
 	std::cout << std::endl;
 
diff --git a/examples/source/custom_reader.cpp b/examples/source/custom_reader.cpp
index 3e0d4302..9aaf8edf 100644
--- a/examples/source/custom_reader.cpp
+++ b/examples/source/custom_reader.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 #include <iostream>
 #include <exception>
@@ -20,17 +19,16 @@ struct custom_reader {
 	std::size_t read_count;
 
 	custom_reader(FILE* f_) : f(f_), buffer(), current_size(0), read_count(0) {
-
 	}
 
 	bool read() {
 		std::cout << "custom read: read #" << ++read_count << std::endl;
-		current_size = fread( buffer, 1, 2, f );
+		current_size = fread(buffer, 1, 2, f);
 		return current_size > 0 && ferror(f) == 0;
 	}
 
-	~custom_reader( ) {
-		std::fclose( f );
+	~custom_reader() {
+		std::fclose(f);
 	}
 };
 
@@ -38,7 +36,7 @@ struct custom_reader {
 // const char* ( lua_State*, void*, size_t* )
 const char* custom_reader_function(lua_State*, void* pointer_to_my_object, size_t* data_size) {
 	custom_reader& cr = *(static_cast<custom_reader*>(pointer_to_my_object));
-	if ( cr.read( ) ) {
+	if (cr.read()) {
 		*data_size = cr.current_size;
 		return cr.buffer;
 	}
@@ -48,7 +46,7 @@ const char* custom_reader_function(lua_State*, void* pointer_to_my_object, size_
 	}
 }
 
-int main( ) {
+int main() {
 	std::cout << "=== custom reader ===" << std::endl;
 
 	// make a file to use for the custom reader
@@ -65,16 +63,16 @@ int main( ) {
 
 
 	sol::state lua;
-	lua.open_libraries( sol::lib::base );
+	lua.open_libraries(sol::lib::base);
 
 	FILE* bjork_fp;
 #ifdef _MSC_VER
-	if ( fopen_s( &bjork_fp, "bjork.lua", "r" ) != 0 ) {
+	if (fopen_s(&bjork_fp, "bjork.lua", "r") != 0) {
 		std::cerr << "failed to open bjork.lua -- exiting" << std::endl;
 		return -1;
 	}
 #else
-	bjork_fp = fopen( "bjork.lua", "r" );
+	bjork_fp = fopen("bjork.lua", "r");
 #endif
 	if (bjork_fp == nullptr) {
 		std::cerr << "failed to open bjork.lua -- exiting" << std::endl;
@@ -83,11 +81,11 @@ int main( ) {
 	custom_reader reader(bjork_fp);
 
 	// load the code using our custom reader, then run it
-	auto result = lua.safe_script( custom_reader_function, &reader, sol::script_pass_on_error );
+	auto result = lua.safe_script(custom_reader_function, &reader, sol::script_pass_on_error);
 	// make sure we ran loaded and ran the code successfully
-	c_assert( result.valid( ) );
+	sol_c_assert(result.valid());
 
-	// note there are lua.load( ... ) variants that take a 
+	// note there are lua.load( ... ) variants that take a
 	// custom reader than JUST run the code, too!
 
 	std::cout << std::endl;
diff --git a/examples/source/customization_convert_on_get.cpp b/examples/source/customization_convert_on_get.cpp
index da2b5da5..29b9eb17 100644
--- a/examples/source/customization_convert_on_get.cpp
+++ b/examples/source/customization_convert_on_get.cpp
@@ -3,7 +3,6 @@
 
 #include <iostream>
 #include <iomanip>
-#include "assert.hpp"
 
 struct number_shim {
 	double num = 0;
@@ -12,8 +11,7 @@ struct number_shim {
 template <typename Handler>
 bool sol_lua_check(sol::types<number_shim>, lua_State* L, int index, Handler&& handler, sol::stack::record& tracking) {
 	// check_usertype is a backdoor for directly checking sol3 usertypes
-	if (!sol::stack::check_usertype<number_shim>(L, index) 
-		&& !sol::stack::check<double>(L, index)) {
+	if (!sol::stack::check_usertype<number_shim>(L, index) && !sol::stack::check<double>(L, index)) {
 		handler(L, index, sol::type_of(L, index), sol::type::userdata, "expected a number_shim or a number");
 		return false;
 	}
@@ -26,7 +24,7 @@ number_shim sol_lua_get(sol::types<number_shim>, lua_State* L, int index, sol::s
 		number_shim& ns = sol::stack::get_usertype<number_shim>(L, index, tracking);
 		return ns;
 	}
-	number_shim ns{};
+	number_shim ns {};
 	ns.num = sol::stack::get<double>(L, index, tracking);
 	return ns;
 }
@@ -43,12 +41,12 @@ int main() {
 	});
 
 	lua.script("vf = f(25) vg = g(35)");
-	
+
 	number_shim thingsf = lua["vf"];
 	number_shim thingsg = lua["vg"];
 
-	c_assert(thingsf.num == 25);
-	c_assert(thingsg.num == 35);
+	sol_c_assert(thingsf.num == 25);
+	sol_c_assert(thingsg.num == 35);
 
 	return 0;
 }
diff --git a/examples/source/customization_global_transparent_argument.cpp b/examples/source/customization_global_transparent_argument.cpp
index a7e93c33..11ac6484 100644
--- a/examples/source/customization_global_transparent_argument.cpp
+++ b/examples/source/customization_global_transparent_argument.cpp
@@ -50,9 +50,7 @@ int main() {
 	GlobalResource instance;
 
 	// get GlobalResource
-	lua.set_function("f", [](GlobalResource* l, int value) {
-		return l->value + value;
-	});
+	lua.set_function("f", [](GlobalResource* l, int value) { return l->value + value; });
 	lua.set(script_key, &instance);
 
 	// note only 1 argument,
diff --git a/examples/source/customization_multiple.cpp b/examples/source/customization_multiple.cpp
index e6c5c9e3..d36587d5 100644
--- a/examples/source/customization_multiple.cpp
+++ b/examples/source/customization_multiple.cpp
@@ -2,7 +2,6 @@
 #include <sol/sol.hpp>
 
 #include <iostream>
-#include "assert.hpp"
 
 struct two_things {
 	int a;
@@ -57,8 +56,8 @@ int main() {
 	sol::function f = lua["f"];
 
 	two_things things = f(two_things { 24, false });
-	c_assert(things.a == 24);
-	c_assert(things.b == false);
+	sol_c_assert(things.a == 24);
+	sol_c_assert(things.b == false);
 	// things.a == 24
 	// things.b == true
 
diff --git a/examples/source/docs/as_function.cpp b/examples/source/docs/as_function.cpp
index ef9ac613..39c08650 100644
--- a/examples/source/docs/as_function.cpp
+++ b/examples/source/docs/as_function.cpp
@@ -1,9 +1,9 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-int main () {
+int main() {
 	struct callable {
-		int operator()( int a, bool b ) {
+		int operator()(int a, bool b) {
 			return a + (b ? 10 : 20);
 		}
 	};
@@ -13,9 +13,9 @@ int main () {
 	// Binds struct as userdata
 	// can still be callable, but beware
 	// caveats
-	lua.set( "not_func", callable() );
+	lua.set("not_func", callable());
 	// Binds struct as function
-	lua.set( "func", sol::as_function( callable() ) );
+	lua.set("func", sol::as_function(callable()));
 	// equivalent: lua.set_function( "func", callable() );
 	// equivalent: lua["func"] = callable();
 }
diff --git a/examples/source/docs/as_function_usertype_member_variable.cpp b/examples/source/docs/as_function_usertype_member_variable.cpp
index 3907b131..df4c0e73 100644
--- a/examples/source/docs/as_function_usertype_member_variable.cpp
+++ b/examples/source/docs/as_function_usertype_member_variable.cpp
@@ -1,7 +1,7 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-int main () {
+int main() {
 	class B {
 	public:
 		int bvar = 24;
@@ -9,12 +9,13 @@ int main () {
 
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
-	lua.new_usertype<B>("B", 
-		// bind as variable
-		"b", &B::bvar,
-		// bind as function
-		"f", sol::as_function(&B::bvar)
-	);
+	lua.new_usertype<B>("B",
+	     // bind as variable
+	     "b",
+	     &B::bvar,
+	     // bind as function
+	     "f",
+	     sol::as_function(&B::bvar));
 
 	B b;
 	lua.set("b", &b);
diff --git a/examples/source/docs/as_table_ipairs.cpp b/examples/source/docs/as_table_ipairs.cpp
index 43978ce4..b16c15fc 100644
--- a/examples/source/docs/as_table_ipairs.cpp
+++ b/examples/source/docs/as_table_ipairs.cpp
@@ -3,11 +3,11 @@
 
 #include <vector>
 
-int main (int, char*[]) {
-	
+int main(int, char*[]) {
+
 	sol::state lua;
 	lua.open_libraries();
-	lua.set("my_table", sol::as_table(std::vector<int>{ 1, 2, 3, 4, 5 }));
+	lua.set("my_table", sol::as_table(std::vector<int> { 1, 2, 3, 4, 5 }));
 	lua.script("for k, v in ipairs(my_table) do print(k, v) assert(k == v) end");
 
 	return 0;
diff --git a/examples/source/docs/inheritance.cpp b/examples/source/docs/inheritance.cpp
index b1c87f06..c7b13af1 100644
--- a/examples/source/docs/inheritance.cpp
+++ b/examples/source/docs/inheritance.cpp
@@ -1,28 +1,28 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-struct A { 
+struct A {
 	int a = 10;
-	virtual int call() { return 0; }
-	virtual ~A(){}
+	virtual int call() {
+		return 0;
+	}
+	virtual ~A() {
+	}
 };
-struct B : A { 
-	int b = 11; 
-	virtual int call() override { return 20; } 
+struct B : A {
+	int b = 11;
+	virtual int call() override {
+		return 20;
+	}
 };
 
-int main (int, char*[]) {
+int main(int, char*[]) {
 
 	sol::state lua;
 
-	lua.new_usertype<B>( "A",
-		"call", &A::call
-	);
+	lua.new_usertype<B>("A", "call", &A::call);
 
-	lua.new_usertype<B>( "B",
-		"call", &B::call,
-		sol::base_classes, sol::bases<A>()
-	);
+	lua.new_usertype<B>("B", "call", &B::call, sol::base_classes, sol::bases<A>());
 
 	return 0;
 }
diff --git a/examples/source/docs/my_panic.cpp b/examples/source/docs/my_panic.cpp
index aee5714e..97d3f4c9 100644
--- a/examples/source/docs/my_panic.cpp
+++ b/examples/source/docs/my_panic.cpp
@@ -11,7 +11,7 @@ inline void my_panic(sol::optional<std::string> maybe_msg) {
 	// When this function exits, Lua will exhibit default behavior and abort()
 }
 
-int main (int, char*[]) {
+int main(int, char*[]) {
 	sol::state lua(sol::c_call<decltype(&my_panic), &my_panic>);
 	// or, if you already have a lua_State* L
 	// lua_atpanic( L, sol::c_call<decltype(&my_panic), &my_panic> );
@@ -20,7 +20,7 @@ int main (int, char*[]) {
 	// lua.set_panic( sol::c_call<decltype(&my_panic), &my_panic> );
 
 	// uncomment the below to see
-	//lua.script("boom_goes.the_dynamite");
+	// lua.script("boom_goes.the_dynamite");
 
 	return 0;
 }
diff --git a/examples/source/docs/preparing_environments.cpp b/examples/source/docs/preparing_environments.cpp
index f3820f7e..be498df5 100644
--- a/examples/source/docs/preparing_environments.cpp
+++ b/examples/source/docs/preparing_environments.cpp
@@ -1,12 +1,12 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-int main (int, char*[]) {
+int main(int, char*[]) {
 	sol::state lua;
 	lua.open_libraries();
 	sol::environment my_env(lua, sol::create);
-	// set value, and we need to explicitly allow for 
-	// access to "print", since a new environment hides 
+	// set value, and we need to explicitly allow for
+	// access to "print", since a new environment hides
 	// everything that's not defined inside of it
 	// NOTE: hiding also hides library functions (!!)
 	// BE WARNED
@@ -15,7 +15,7 @@ int main (int, char*[]) {
 
 	sol::environment my_other_env(lua, sol::create, lua.globals());
 	// do not need to explicitly allow access to "print",
-	// since we used the "Set a fallback" version 
+	// since we used the "Set a fallback" version
 	// of the sol::environment constructor
 	my_other_env["var"] = 443;
 
diff --git a/examples/source/docs/references_in_lambdas.cpp b/examples/source/docs/references_in_lambdas.cpp
index f681d2a7..82101449 100644
--- a/examples/source/docs/references_in_lambdas.cpp
+++ b/examples/source/docs/references_in_lambdas.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 
 int main(int, char*[]) {
 
@@ -11,12 +10,8 @@ int main(int, char*[]) {
 
 	test t;
 	sol::state lua;
-	lua.set_function("f", [&t]() {
-		return t;
-	});
-	lua.set_function("g", [&t]() -> test& {
-		return t;
-	});
+	lua.set_function("f", [&t]() { return t; });
+	lua.set_function("g", [&t]() -> test& { return t; });
 
 	lua.script("t1 = f()");
 	lua.script("t2 = g()");
@@ -25,9 +20,9 @@ int main(int, char*[]) {
 	test& from_lua_t2 = lua["t2"];
 
 	// not the same: 'f' lambda copied
-	c_assert(&from_lua_t1 != &t);
+	sol_c_assert(&from_lua_t1 != &t);
 	// the same: 'g' lambda returned reference
-	c_assert(&from_lua_t2 == &t);
+	sol_c_assert(&from_lua_t2 == &t);
 
 	return 0;
 }
diff --git a/examples/source/docs/runtime_extension.cpp b/examples/source/docs/runtime_extension.cpp
index 9d36d0d4..b1fa4738 100644
--- a/examples/source/docs/runtime_extension.cpp
+++ b/examples/source/docs/runtime_extension.cpp
@@ -3,24 +3,24 @@
 
 #include <iostream>
 
-struct object { 
-	int value = 0; 
+struct object {
+	int value = 0;
 };
 
-int main (int, char*[]) {
+int main(int, char*[]) {
 
 	std::cout << "==== runtime_extension =====" << std::endl;
 
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	lua.new_usertype<object>( "object" );
+	lua.new_usertype<object>("object");
 
 	// runtime additions: through the sol API
 	lua["object"]["func"] = [](object& o) { return o.value; };
 	// runtime additions: through a lua script
 	lua.script("function object:print () print(self:func()) end");
-	
+
 	// see it work
 	lua.script("local obj = object.new() \n obj:print()");
 
diff --git a/examples/source/docs/simple_functions.cpp b/examples/source/docs/simple_functions.cpp
index c49c8539..d9921f2a 100644
--- a/examples/source/docs/simple_functions.cpp
+++ b/examples/source/docs/simple_functions.cpp
@@ -1,18 +1,17 @@
 #define SOL_ALL_SAFETIES_ON 1
 
 #include <sol/sol.hpp>
-#include <assert.hpp>
 
 int main() {
 	sol::state lua;
 	int x = 0;
-	lua.set_function("beep", [&x]{ ++x; });
+	lua.set_function("beep", [&x] { ++x; });
 	lua.script("beep()");
-	c_assert(x == 1);
+	sol_c_assert(x == 1);
 
 	sol::function beep = lua["beep"];
 	beep();
-	c_assert(x == 2);
+	sol_c_assert(x == 2);
 
 	return 0;
 }
diff --git a/examples/source/docs/simple_structs.cpp b/examples/source/docs/simple_structs.cpp
index 9b0fc272..ce8d529a 100644
--- a/examples/source/docs/simple_structs.cpp
+++ b/examples/source/docs/simple_structs.cpp
@@ -1,32 +1,30 @@
 #define SOL_ALL_SAFETIES_ON 1
 
 #include <sol/sol.hpp>
-#include <assert.hpp>
 
 struct vars {
 	int boop = 0;
 
-	int bop () const {
+	int bop() const {
 		return boop + 1;
 	}
 };
 
 int main() {
 	sol::state lua;
-	lua.new_usertype<vars>("vars", 
-		"boop", &vars::boop,
-		"bop", &vars::bop);
-	lua.script("beep = vars.new()\n"
-		"beep.boop = 1\n"
-		"bopvalue = beep:bop()");
+	lua.new_usertype<vars>("vars", "boop", &vars::boop, "bop", &vars::bop);
+	lua.script(
+	     "beep = vars.new()\n"
+	     "beep.boop = 1\n"
+	     "bopvalue = beep:bop()");
 
 	vars& beep = lua["beep"];
 	int bopvalue = lua["bopvalue"];
 
-	c_assert(beep.boop == 1);
-	c_assert(lua.get<vars>("beep").boop == 1);
-	c_assert(beep.bop() == 2);
-	c_assert(bopvalue == 2);
+	sol_c_assert(beep.boop == 1);
+	sol_c_assert(lua.get<vars>("beep").boop == 1);
+	sol_c_assert(beep.bop() == 2);
+	sol_c_assert(bopvalue == 2);
 
 	return 0;
 }
diff --git a/examples/source/docs/state_script_safe.cpp b/examples/source/docs/state_script_safe.cpp
index 22defee3..633f71e1 100644
--- a/examples/source/docs/state_script_safe.cpp
+++ b/examples/source/docs/state_script_safe.cpp
@@ -3,20 +3,20 @@
 
 #include <iostream>
 
-int main () {
+int main() {
 
 	std::cout << "=== safe_script usage ===" << std::endl;
 
 	sol::state lua;
-	// uses sol::script_default_on_error, which either panics or throws, 
+	// uses sol::script_default_on_error, which either panics or throws,
 	// depending on your configuration and compiler settings
 	try {
 		auto result1 = lua.safe_script("bad.code");
 	}
-	catch( const sol::error& e ) {
+	catch (const sol::error& e) {
 		std::cout << "an expected error has occurred: " << e.what() << std::endl;
 	}
-	
+
 	// a custom handler that you write yourself
 	// is only called when an error happens with loading or running the script
 	auto result2 = lua.safe_script("123 bad.code", [](lua_State*, sol::protected_function_result pfr) {
diff --git a/examples/source/docs/state_transfer.cpp b/examples/source/docs/state_transfer.cpp
index 1728810e..8e77db2f 100644
--- a/examples/source/docs/state_transfer.cpp
+++ b/examples/source/docs/state_transfer.cpp
@@ -2,17 +2,16 @@
 
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 #include <iostream>
 
-int main (int, char*[]) {
+int main(int, char*[]) {
 
 	sol::state lua;
 	lua.open_libraries();
 	sol::function transferred_into;
 	lua["f"] = [&lua, &transferred_into](sol::object t, sol::this_state this_L) {
-		std::cout << "state of main     : "  << (void*)lua.lua_state() << std::endl;
-		std::cout << "state of function : "  << (void*)this_L.lua_state() << std::endl;
+		std::cout << "state of main     : " << (void*)lua.lua_state() << std::endl;
+		std::cout << "state of function : " << (void*)this_L.lua_state() << std::endl;
 		// pass original lua_State* (or sol::state/sol::state_view)
 		// transfers ownership from the state of "t",
 		// to the "lua" sol::state
@@ -42,7 +41,7 @@ int main (int, char*[]) {
 	transferred_into();
 	// check
 	int i = lua["i"];
-	c_assert(i == 1);
+	sol_c_assert(i == 1);
 
 	return 0;
-} 
+}
diff --git a/examples/source/dump.cpp b/examples/source/dump.cpp
index 96061c93..aaf39342 100644
--- a/examples/source/dump.cpp
+++ b/examples/source/dump.cpp
@@ -2,7 +2,6 @@
 #include <sol/sol.hpp>
 
 #include <iostream>
-#include "assert.hpp"
 
 
 int main() {
@@ -21,7 +20,7 @@ int main() {
 	// load this code (but do not run)
 	sol::load_result lr = lua.load("a = function (v) print(v) return v end");
 	// check if it's sucessfully loaded
-	c_assert(lr.valid());
+	sol_c_assert(lr.valid());
 
 	// turn it into a function, then dump the bytecode
 	sol::protected_function target = lr.get<sol::protected_function>();
@@ -31,12 +30,12 @@ int main() {
 	// in the SECOND state
 	auto result2 = lua2.safe_script(target_bc.as_string_view(), sol::script_pass_on_error);
 	// check if it was done properly
-	c_assert(result2.valid());
+	sol_c_assert(result2.valid());
 
 	// check in the second state if it was valid
 	sol::protected_function pf = lua2["a"];
 	int v = pf(25557);
-	c_assert(v == 25557);
+	sol_c_assert(v == 25557);
 
 	return 0;
 }
\ No newline at end of file
diff --git a/examples/source/dynamic_object.cpp b/examples/source/dynamic_object.cpp
index 795af238..d656fb87 100644
--- a/examples/source/dynamic_object.cpp
+++ b/examples/source/dynamic_object.cpp
@@ -3,7 +3,6 @@
 
 #include <iostream>
 #include <unordered_map>
-#include "assert.hpp"
 
 // use as-is,
 // add as a member of your class,
@@ -76,7 +75,7 @@ assert(value == 15)
 
 	// does not work on d1: 'run' wasn't added to d1, only d2
 	auto script_result = lua.safe_script("local value = d1:run(5)", sol::script_pass_on_error);
-	c_assert(!script_result.valid());
+	sol_c_assert(!script_result.valid());
 	sol::error err = script_result;
 	std::cout << "received expected error: " << err.what() << std::endl;
 	std::cout << std::endl;
diff --git a/examples/source/environment_snooping.cpp b/examples/source/environment_snooping.cpp
index 1c3fdf10..d5a86268 100644
--- a/examples/source/environment_snooping.cpp
+++ b/examples/source/environment_snooping.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 
 // Simple sol3 version of the below
@@ -48,12 +47,12 @@ void complicated(sol::this_state ts) {
 
 	// Okay, so all the calls worked.
 	// Print out some information about this "level"
-	std::cout << "manually -- [" << level << "] " << info.short_src << ":" << info.currentline
-		<< " -- " << (info.name ? info.name : "<unknown>") << "[" << info.what << "]" << std::endl;
+	std::cout << "manually -- [" << level << "] " << info.short_src << ":" << info.currentline << " -- " << (info.name ? info.name : "<unknown>") << "["
+	          << info.what << "]" << std::endl;
 
 	// Grab the function off the top of the stack
 	// remember: -1 means top, -2 means 1 below the top, and so on...
-	// 1 means the very bottom of the stack, 
+	// 1 means the very bottom of the stack,
 	// 2 means 1 more up, and so on to the top value...
 	sol::function f(L, -1);
 	// The environment can now be ripped out of the function
diff --git a/examples/source/environment_state.cpp b/examples/source/environment_state.cpp
index c8768795..2c2e5d45 100644
--- a/examples/source/environment_state.cpp
+++ b/examples/source/environment_state.cpp
@@ -9,8 +9,8 @@ int main(int, char*[]) {
 	sol::state lua;
 	lua.open_libraries();
 	sol::environment my_env(lua, sol::create);
-	// set value, and we need to explicitly allow for 
-	// access to "print", since a new environment hides 
+	// set value, and we need to explicitly allow for
+	// access to "print", since a new environment hides
 	// everything that's not defined inside of it
 	// NOTE: hiding also hides library functions (!!)
 	// BE WARNED
@@ -19,7 +19,7 @@ int main(int, char*[]) {
 
 	sol::environment my_other_env(lua, sol::create, lua.globals());
 	// do not need to explicitly allow access to "print",
-	// since we used the "Set a fallback" version 
+	// since we used the "Set a fallback" version
 	// of the sol::environment constructor
 	my_other_env["var"] = 443;
 
diff --git a/examples/source/environment_state_2.cpp b/examples/source/environment_state_2.cpp
index 57ec2fee..76be04b7 100644
--- a/examples/source/environment_state_2.cpp
+++ b/examples/source/environment_state_2.cpp
@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	std::cout << "=== environment state 2 ===" << std::endl;
 
 	sol::state lua;
diff --git a/examples/source/environments_on_functions.cpp b/examples/source/environments_on_functions.cpp
index baa0e77b..80891202 100644
--- a/examples/source/environments_on_functions.cpp
+++ b/examples/source/environments_on_functions.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 
 int main(int, char**) {
@@ -13,16 +12,16 @@ int main(int, char**) {
 
 	lua.script("f = function() return test end");
 	sol::function f = lua["f"];
-	
+
 	sol::environment env_f(lua, sol::create);
 	env_f["test"] = 31;
 	sol::set_environment(env_f, f);
 
 	// the function returns the value from the environment table
 	int result = f();
-	c_assert(result == 31);
+	sol_c_assert(result == 31);
+
 
-	
 	// You can also protect from variables
 	// being set without the 'local' specifier
 	lua.script("g = function() test = 5 end");
@@ -33,13 +32,13 @@ int main(int, char**) {
 	g();
 	// the value can be retrieved from the env table
 	int test = env_g["test"];
-	c_assert(test == 5);
+	sol_c_assert(test == 5);
 
 
 	// the global environment
 	// is not polluted at all, despite both functions being used and set
 	sol::object global_test = lua["test"];
-	c_assert(!global_test.valid());
+	sol_c_assert(!global_test.valid());
 
 
 	// You can retrieve environments in C++
@@ -49,31 +48,28 @@ int main(int, char**) {
 	// get the environment from any sol::reference-styled type,
 	// including sol::object, sol::function, sol::table, sol::userdata ...
 	lua.set_function("check_f_env",
-		// capture necessary variable in C++ lambda
-		[&env_f]( sol::object target ) {
-			// pull out the environment from func using
-			// sol::env_key constructor
-			sol::environment target_env(sol::env_key, target);
-			int test_env_f = env_f["test"];
-			int test_target_env = target_env["test"];
-			// the environment for f the one gotten from `target`
-			// are the same
-			c_assert(test_env_f == test_target_env);
-			c_assert(test_env_f == 31);
-			c_assert(env_f == target_env);
-		}
-	);
-	lua.set_function("check_g_env",
-		[&env_g](sol::function target) {
-			// equivalent:
-			sol::environment target_env = sol::get_environment(target);
-			int test_env_g = env_g["test"];
-			int test_target_env = target_env["test"];
-			c_assert(test_env_g == test_target_env);
-			c_assert(test_env_g == 5);
-			c_assert(env_g == target_env);
-		}
-	);
+	     // capture necessary variable in C++ lambda
+	     [&env_f](sol::object target) {
+		     // pull out the environment from func using
+		     // sol::env_key constructor
+		     sol::environment target_env(sol::env_key, target);
+		     int test_env_f = env_f["test"];
+		     int test_target_env = target_env["test"];
+		     // the environment for f the one gotten from `target`
+		     // are the same
+		     sol_c_assert(test_env_f == test_target_env);
+		     sol_c_assert(test_env_f == 31);
+		     sol_c_assert(env_f == target_env);
+	     });
+	lua.set_function("check_g_env", [&env_g](sol::function target) {
+		// equivalent:
+		sol::environment target_env = sol::get_environment(target);
+		int test_env_g = env_g["test"];
+		int test_target_env = target_env["test"];
+		sol_c_assert(test_env_g == test_target_env);
+		sol_c_assert(test_env_g == 5);
+		sol_c_assert(env_g == target_env);
+	});
 
 	lua.script("check_f_env(f)");
 	lua.script("check_g_env(g)");
diff --git a/examples/source/exception_handler.cpp b/examples/source/exception_handler.cpp
index 852afe62..1f12ee23 100644
--- a/examples/source/exception_handler.cpp
+++ b/examples/source/exception_handler.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 #include <iostream>
 
@@ -43,7 +42,7 @@ int main() {
 
 	sol::protected_function_result pfr = lua.safe_script("will_throw()", &sol::script_pass_on_error);
 
-	c_assert(!pfr.valid());
+	sol_c_assert(!pfr.valid());
 
 	sol::error err = pfr;
 	std::cout << err.what() << std::endl;
diff --git a/examples/source/functions.cpp b/examples/source/functions.cpp
index 007dff3c..134b3885 100644
--- a/examples/source/functions.cpp
+++ b/examples/source/functions.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 
 inline int my_add(int x, int y) {
@@ -9,13 +8,13 @@ inline int my_add(int x, int y) {
 }
 
 struct multiplier {
-    int operator()(int x) {
-        return x * 10;
-    }
+	int operator()(int x) {
+		return x * 10;
+	}
 
-    static int by_five(int x) {
-        return x * 5;
-    }
+	static int by_five(int x) {
+		return x * 5;
+	}
 };
 
 int main() {
@@ -31,7 +30,7 @@ int main() {
 	lua.set_function("my_mul", [](double x, double y) { return x * y; });
 
 	// member function pointers and functors as well
-	lua.set_function("mult_by_ten", multiplier{});
+	lua.set_function("mult_by_ten", multiplier {});
 	lua.set_function("mult_by_five", &multiplier::by_five);
 
 	// assert that the functions work
@@ -46,7 +45,7 @@ int main() {
 
 	// calling a stateful lambda modifies the value
 	lua.script("inc()");
-	c_assert(x == 10);
+	sol_c_assert(x == 10);
 	if (x == 10) {
 		// Do something based on this information
 		std::cout << "Yahoo! x is " << x << std::endl;
@@ -58,7 +57,7 @@ inc()
 inc()
 inc()
 )");
-	c_assert(x == 40);
+	sol_c_assert(x == 40);
 	if (x == 40) {
 		// Do something based on this information
 		std::cout << "Yahoo! x is " << x << std::endl;
@@ -70,8 +69,8 @@ inc()
 	int value = add(10, 11);
 	// second way to call the function
 	int value2 = add.call<int>(10, 11);
-	c_assert(value == 21);
-	c_assert(value2 == 21);
+	sol_c_assert(value == 21);
+	sol_c_assert(value2 == 21);
 	if (value == 21 && value2 == 21) {
 		std::cout << "Woo, value is 21!" << std::endl;
 	}
diff --git a/examples/source/functions_empty_arguments.cpp b/examples/source/functions_empty_arguments.cpp
index 6d93e9b7..2150d2ce 100644
--- a/examples/source/functions_empty_arguments.cpp
+++ b/examples/source/functions_empty_arguments.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 
 int main(int, char*[]) {
diff --git a/examples/source/index_and_newindex_usertype.cpp b/examples/source/index_and_newindex_usertype.cpp
index bc87e1d6..c8772cf8 100644
--- a/examples/source/index_and_newindex_usertype.cpp
+++ b/examples/source/index_and_newindex_usertype.cpp
@@ -1,13 +1,13 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 class vector {
 public:
 	double data[3];
 
-	vector() : data{ 0,0,0 } {}
+	vector() : data { 0, 0, 0 } {
+	}
 
 	double& operator[](int i) {
 		return data[i];
@@ -23,22 +23,21 @@ public:
 	}
 };
 
-int main () {
+int main() {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
-	lua.new_usertype<vector>("vector", sol::constructors<sol::types<>>(),
-		sol::meta_function::index, &vector::my_index,
-		sol::meta_function::new_index, &vector::my_new_index);
-	lua.script("v = vector.new()\n"
-		"print(v[1])\n"
-		"v[2] = 3\n"
-		"print(v[2])\n"
-	);
+	lua.new_usertype<vector>(
+	     "vector", sol::constructors<sol::types<>>(), sol::meta_function::index, &vector::my_index, sol::meta_function::new_index, &vector::my_new_index);
+	lua.script(
+	     "v = vector.new()\n"
+	     "print(v[1])\n"
+	     "v[2] = 3\n"
+	     "print(v[2])\n");
 
 	vector& v = lua["v"];
-	c_assert(v[0] == 0.0);
-	c_assert(v[1] == 0.0);
-	c_assert(v[2] == 3.0);
+	sol_c_assert(v[0] == 0.0);
+	sol_c_assert(v[1] == 0.0);
+	sol_c_assert(v[2] == 3.0);
 
 	return 0;
 }
diff --git a/examples/source/indirect_function_calls.cpp b/examples/source/indirect_function_calls.cpp
index da9e13ca..735e3bde 100644
--- a/examples/source/indirect_function_calls.cpp
+++ b/examples/source/indirect_function_calls.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 
 sol::variadic_results call_it(sol::object function_name, sol::variadic_args args, sol::this_environment env, sol::this_state L) {
@@ -33,7 +32,7 @@ sol::variadic_results call_it(sol::object function_name, sol::variadic_args args
 	return results;
 }
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	std::cout << "=== indirect function calls ===" << std::endl;
 
 	sol::state lua;
@@ -67,8 +66,8 @@ end
 	int subtract_result = lua["subtract_result"];
 	int add_result = lua["add_result"];
 
-	c_assert(add_result == 6);
-	c_assert(subtract_result == 4);
+	sol_c_assert(add_result == 6);
+	sol_c_assert(subtract_result == 4);
 
 	std::cout << std::endl;
 	return 0;
diff --git a/examples/source/lua_value.cpp b/examples/source/lua_value.cpp
index 97ce227d..07577d42 100644
--- a/examples/source/lua_value.cpp
+++ b/examples/source/lua_value.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 #include <string>
 
@@ -14,7 +13,7 @@ struct int_entry {
 	int_entry(int v) : value(v) {
 	}
 
-	std::string to_string () const {
+	std::string to_string() const {
 		return "int_entry(" + std::to_string(value) + ")";
 	}
 
@@ -23,7 +22,7 @@ struct int_entry {
 	}
 };
 
-int main(int, char* []) {
+int main(int, char*[]) {
 
 	std::cout << "=== sol::lua_value/sol::array_value ===" << std::endl;
 
@@ -33,8 +32,8 @@ int main(int, char* []) {
 	sol::lua_value lv_int(lua, 56);
 	sol::lua_value lv_int_table(lua, { 1, 2, 3, 4, 5 });
 	sol::lua_value lv_map(lua, { { "bark bark", "meow hiss!" }, { 3, 4 }, { ":D", 6 } });
-	sol::lua_value lv_mixed_table(lua, sol::array_value{ 1, int_entry(2), 3, int_entry(4), 5 });
-	sol::lua_value lv_mixed_nested_table(lua, sol::array_value{ 1, int_entry(2), 3, int_entry(4), sol::array_value{ 5, 6, int_entry(7), "8" } });
+	sol::lua_value lv_mixed_table(lua, sol::array_value { 1, int_entry(2), 3, int_entry(4), 5 });
+	sol::lua_value lv_mixed_nested_table(lua, sol::array_value { 1, int_entry(2), 3, int_entry(4), sol::array_value { 5, 6, int_entry(7), "8" } });
 
 	const auto& code = R"(
 		function real_print_recursive (e, level)
diff --git a/examples/source/metatable_key_low_level.cpp b/examples/source/metatable_key_low_level.cpp
index 8e79ab44..62b1694e 100644
--- a/examples/source/metatable_key_low_level.cpp
+++ b/examples/source/metatable_key_low_level.cpp
@@ -1,9 +1,8 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
-int main(int, char* []) {
+int main(int, char*[]) {
 
 	struct bark {
 		int operator()(int x) {
@@ -14,14 +13,12 @@ int main(int, char* []) {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	lua.new_usertype<bark>("bark",
-		sol::meta_function::call_function, &bark::operator()
-	);
+	lua.new_usertype<bark>("bark", sol::meta_function::call_function, &bark::operator());
 
 	bark b;
 	lua.set("b", &b);
 
-	sol::table b_as_table = lua["b"];		
+	sol::table b_as_table = lua["b"];
 	sol::table b_metatable = b_as_table[sol::metatable_key];
 	sol::function b_call = b_metatable["__call"];
 	sol::function b_as_function = lua["b"];
@@ -29,7 +26,7 @@ int main(int, char* []) {
 	int result1 = b_as_function(1);
 	// pass 'self' directly to argument
 	int result2 = b_call(b, 1);
-	c_assert(result1 == result2);
-	c_assert(result1 == 1);
-	c_assert(result2 == 1);
+	sol_c_assert(result1 == result2);
+	sol_c_assert(result1 == 1);
+	sol_c_assert(result2 == 1);
 }
diff --git a/examples/source/multi_results.cpp b/examples/source/multi_results.cpp
index 6487f72a..4c76426b 100644
--- a/examples/source/multi_results.cpp
+++ b/examples/source/multi_results.cpp
@@ -2,7 +2,6 @@
 #include <sol/sol.hpp>
 
 #include <tuple>
-#include "assert.hpp"
 #include <iostream>
 
 int main() {
@@ -15,9 +14,7 @@ int main() {
 	// std::tuple as the transfer type,
 	// sol::as_returns for containers,
 	// and sol::variadic_results for more special things
-	lua.set_function("multi_tuple", [] { 
-		return std::make_tuple(10, "goodbye"); 
-	});
+	lua.set_function("multi_tuple", [] { return std::make_tuple(10, "goodbye"); });
 	lua.script("print('calling multi_tuple')");
 	lua.script("print(multi_tuple())");
 	lua.script("x, y = multi_tuple()");
@@ -30,18 +27,18 @@ int main() {
 	sol::tie(first, second) = multi();
 
 	// use the values
-	c_assert(first == 10);
-	c_assert(second == "goodbye");
+	sol_c_assert(first == 10);
+	sol_c_assert(second == "goodbye");
 
 	// sol::as_returns
-	// works with any iterable, 
+	// works with any iterable,
 	// but we show off std::vector here
-	lua.set_function("multi_containers", [] (bool add_extra) { 
-		std::vector<int> values{55, 66};
+	lua.set_function("multi_containers", [](bool add_extra) {
+		std::vector<int> values { 55, 66 };
 		if (add_extra) {
 			values.push_back(77);
 		}
-		return sol::as_returns(std::move(values)); 
+		return sol::as_returns(std::move(values));
 	});
 	lua.script("print('calling multi_containers')");
 	lua.script("print(multi_containers(false))");
@@ -50,9 +47,9 @@ int main() {
 	int b = lua["b"];
 	int c = lua["c"];
 
-	c_assert(a == 55);
-	c_assert(b == 66);
-	c_assert(c == 77);
+	sol_c_assert(a == 55);
+	sol_c_assert(b == 66);
+	sol_c_assert(c == 77);
 
 	// sol::variadic_results
 	// you can push objects of different types
@@ -73,9 +70,9 @@ int main() {
 	bool u = lua["u"];
 	std::string v = lua["v"];
 
-	c_assert(t == 42);
-	c_assert(u);
-	c_assert(v == "awoo");
+	sol_c_assert(t == 42);
+	sol_c_assert(u);
+	sol_c_assert(v == "awoo");
 
 	return 0;
 }
\ No newline at end of file
diff --git a/examples/source/optional_with_iteration.cpp b/examples/source/optional_with_iteration.cpp
index 74765e39..b93473d6 100644
--- a/examples/source/optional_with_iteration.cpp
+++ b/examples/source/optional_with_iteration.cpp
@@ -17,9 +17,9 @@ struct super_thing : thing {
 	int b = 40;
 };
 
-struct unrelated {};
+struct unrelated { };
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	std::cout << "=== optional with iteration ===" << std::endl;
 
 	sol::state lua;
@@ -31,11 +31,11 @@ int main(int, char* []) {
 	lua.new_usertype<super_thing>("super_thing", sol::base_classes, sol::bases<thing>());
 
 	// Make a few things
-	lua["t1"] = thing{};
-	lua["t2"] = super_thing{};
-	lua["t3"] = unrelated{};
+	lua["t1"] = thing {};
+	lua["t2"] = super_thing {};
+	lua["t3"] = unrelated {};
 	// And a table
-	lua["container"] = lua.create_table_with(0, thing{ 50 }, 1, unrelated{}, 4, super_thing{});
+	lua["container"] = lua.create_table_with(0, thing { 50 }, 1, unrelated {}, 4, super_thing {});
 
 
 	std::vector<std::reference_wrapper<thing>> things;
diff --git a/examples/source/overloading.cpp b/examples/source/overloading.cpp
index 696e153f..666a494c 100644
--- a/examples/source/overloading.cpp
+++ b/examples/source/overloading.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 
 inline int my_add(int x, int y) {
@@ -23,11 +22,7 @@ int main() {
 	// you want to pack into a single name:
 	// make SURE they take different types!
 
-	lua.set_function("func", sol::overload(
-		[](int x) { return x; }, 
-		make_string, 
-		my_add
-	));
+	lua.set_function("func", sol::overload([](int x) { return x; }, make_string, my_add));
 
 	// All these functions are now overloaded through "func"
 	lua.script(R"(
diff --git a/examples/source/overloading_with_fallback.cpp b/examples/source/overloading_with_fallback.cpp
index c14ed461..60d94042 100644
--- a/examples/source/overloading_with_fallback.cpp
+++ b/examples/source/overloading_with_fallback.cpp
@@ -28,16 +28,12 @@ int main(int, char*[]) {
 	sol::state lua;
 	lua.open_libraries();
 
-	lua.set_function("f", sol::overload(
-		func_1,
-		func_2,
-		fallback
-	));
+	lua.set_function("f", sol::overload(func_1, func_2, fallback));
 
-	lua.script("print(f(1))"); // func_1
-	lua.script("print(f('hi'))"); // func_2
+	lua.script("print(f(1))");      // func_1
+	lua.script("print(f('hi'))");   // func_2
 	lua.script("print(f(22, 11))"); // fallback
-	lua.script("print(f({}))"); // fallback
+	lua.script("print(f({}))");     // fallback
 
 	return 0;
 }
diff --git a/examples/source/overloading_with_members.cpp b/examples/source/overloading_with_members.cpp
index 92f1260d..8b02ef1e 100644
--- a/examples/source/overloading_with_members.cpp
+++ b/examples/source/overloading_with_members.cpp
@@ -1,48 +1,46 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 #include <iostream>
 
 struct pup {
 	int barks = 0;
 
-	void bark () {
+	void bark() {
 		++barks; // bark!
 	}
 
-	bool is_cute () const { 
+	bool is_cute() const {
 		return true;
 	}
 };
 
-void ultra_bark( pup& p, int barks) {
-	for (; barks --> 0;) p.bark();
+void ultra_bark(pup& p, int barks) {
+	for (; barks-- > 0;)
+		p.bark();
 }
 
-void picky_bark( pup& p, std::string s) {
-	if ( s == "bark" )
-	    p.bark();
+void picky_bark(pup& p, std::string s) {
+	if (s == "bark")
+		p.bark();
 }
 
-int main () {
+int main() {
 	std::cout << "=== overloading with members ===" << std::endl;
 
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	lua.set_function( "bark", sol::overload( 
-		ultra_bark, 
-		[]() { return "the bark from nowhere"; } 
-	) );
+	lua.set_function("bark", sol::overload(ultra_bark, []() { return "the bark from nowhere"; }));
 
-	lua.new_usertype<pup>( "pup",
-		// regular function
-		"is_cute", &pup::is_cute,
-		// overloaded function
-		"bark", sol::overload( &pup::bark, &picky_bark )
-	);
+	lua.new_usertype<pup>("pup",
+	     // regular function
+	     "is_cute",
+	     &pup::is_cute,
+	     // overloaded function
+	     "bark",
+	     sol::overload(&pup::bark, &picky_bark));
 
 	const auto& code = R"(
 	barker = pup.new()
@@ -59,7 +57,7 @@ int main () {
 
 	pup& barker = lua["barker"];
 	std::cout << barker.barks << std::endl;
-	c_assert(barker.barks == 22);
+	sol_c_assert(barker.barks == 22);
 
 	std::cout << std::endl;
 	return 0;
diff --git a/examples/source/overridable_function_members.cpp b/examples/source/overridable_function_members.cpp
index 3fe17f1c..25ed081f 100644
--- a/examples/source/overridable_function_members.cpp
+++ b/examples/source/overridable_function_members.cpp
@@ -15,15 +15,12 @@ int main() {
 		void default_paint() {
 			std::cout << "p" << std::endl;
 		}
-
 	};
 
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	lua.new_usertype<thingy>("thingy",
-		sol::constructors<thingy(sol::this_state)>(),
-		"paint", &thingy::paint);
+	lua.new_usertype<thingy>("thingy", sol::constructors<thingy(sol::this_state)>(), "paint", &thingy::paint);
 
 	sol::string_view code = R"(
 obj = thingy.new()
diff --git a/examples/source/pairs.cpp b/examples/source/pairs.cpp
index 215161b1..d056e539 100644
--- a/examples/source/pairs.cpp
+++ b/examples/source/pairs.cpp
@@ -5,7 +5,7 @@
 #include <iostream>
 
 struct my_thing {
-	std::map<std::string, int> m{
+	std::map<std::string, int> m {
 		{ "bark", 20 },
 		{ "woof", 60 },
 		{ "borf", 30 },
@@ -13,7 +13,6 @@ struct my_thing {
 	};
 
 	my_thing() {
-
 	}
 };
 
@@ -22,26 +21,24 @@ struct lua_iterator_state {
 	it_t it;
 	it_t last;
 
-	lua_iterator_state(my_thing& mt) : it(mt.m.begin()), last(mt.m.end()) {}
+	lua_iterator_state(my_thing& mt) : it(mt.m.begin()), last(mt.m.end()) {
+	}
 };
 
 std::tuple<sol::object, sol::object> my_next(sol::user<lua_iterator_state&> user_it_state, sol::this_state l) {
-	// this gets called 
+	// this gets called
 	// to start the first iteration, and every
 	// iteration there after
 
 	// the state you passed in my_pairs is argument 1
-	// the key value is argument 2, but we do not 
+	// the key value is argument 2, but we do not
 	// care about the key value here
 	lua_iterator_state& it_state = user_it_state;
 	auto& it = it_state.it;
 	if (it == it_state.last) {
-		// return nil to signify that 
+		// return nil to signify that
 		// there's nothing more to work with.
-		return std::make_tuple(
-			sol::object(sol::lua_nil),
-			sol::object(sol::lua_nil)
-		);
+		return std::make_tuple(sol::object(sol::lua_nil), sol::object(sol::lua_nil));
 	}
 	auto itderef = *it;
 	// 2 values are returned (pushed onto the stack):
@@ -73,9 +70,7 @@ int main(int, char*[]) {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	lua.new_usertype<my_thing>("my_thing",
-		sol::meta_function::pairs, my_pairs
-	);
+	lua.new_usertype<my_thing>("my_thing", sol::meta_function::pairs, my_pairs);
 
 #if SOL_LUA_VERSION > 501
 	lua.safe_script(R"(
diff --git a/examples/source/pairs_with_raw_functions.cpp b/examples/source/pairs_with_raw_functions.cpp
index cfb5af52..96392a88 100644
--- a/examples/source/pairs_with_raw_functions.cpp
+++ b/examples/source/pairs_with_raw_functions.cpp
@@ -5,7 +5,7 @@
 #include <iostream>
 
 struct my_thing {
-	std::map<std::string, int> m{
+	std::map<std::string, int> m {
 		{ "bark", 20 },
 		{ "woof", 60 },
 		{ "borf", 30 },
@@ -13,7 +13,6 @@ struct my_thing {
 	};
 
 	my_thing() {
-
 	}
 };
 
@@ -22,11 +21,12 @@ struct lua_iterator_state {
 	it_t it;
 	it_t last;
 
-	lua_iterator_state(my_thing& mt) : it(mt.m.begin()), last(mt.m.end()) {}
+	lua_iterator_state(my_thing& mt) : it(mt.m.begin()), last(mt.m.end()) {
+	}
 };
 
 int my_next(lua_State* L) {
-	// this gets called 
+	// this gets called
 	// to start the first iteration, and every
 	// iteration there after
 	// the state you passed in pairs is argument 1
@@ -54,7 +54,7 @@ int my_pairs(lua_State* L) {
 	// the "next" function on how to advance,
 	// the "table" itself or some state,
 	// and an initial key value (can be nil)
-	
+
 	// next function controls iteration
 	int pushed = sol::stack::push(L, my_next);
 	pushed += sol::stack::push<sol::user<lua_iterator_state>>(L, std::move(it_state));
@@ -68,9 +68,7 @@ int main(int, char*[]) {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	lua.new_usertype<my_thing>("my_thing",
-		sol::meta_function::pairs, &my_pairs
-	);
+	lua.new_usertype<my_thing>("my_thing", sol::meta_function::pairs, &my_pairs);
 
 #if SOL_LUA_VERSION > 501
 	lua.safe_script(R"(
diff --git a/examples/source/property.cpp b/examples/source/property.cpp
index cd8525b6..b49b9670 100644
--- a/examples/source/property.cpp
+++ b/examples/source/property.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 #include <iostream>
 
@@ -11,7 +10,7 @@ public:
 		return hp;
 	}
 
-	void set_hp( int value ) {
+	void set_hp(int value) {
 		hp = value;
 	}
 
@@ -19,7 +18,7 @@ public:
 		return hp;
 	}
 
-	void set_max_hp( int value ) {
+	void set_max_hp(int value) {
 		maxhp = value;
 	}
 
@@ -28,7 +27,7 @@ private:
 	int maxhp = 50;
 };
 
-int main (int, char*[]) {
+int main(int, char*[]) {
 
 	std::cout << "=== properties from C++ functions ===" << std::endl;
 
@@ -39,10 +38,8 @@ int main (int, char*[]) {
 
 	// Yes, you can register after you set a value and it will
 	// connect up the usertype automatically
-	lua.new_usertype<Player>( "Player",
-		"hp", sol::property(&Player::get_hp, &Player::set_hp),
-		"maxHp", sol::property(&Player::get_max_hp, &Player::set_max_hp)
-	);
+	lua.new_usertype<Player>(
+	     "Player", "hp", sol::property(&Player::get_hp, &Player::set_hp), "maxHp", sol::property(&Player::get_max_hp, &Player::set_max_hp));
 
 	const auto& code = R"(
 	-- variable syntax, calls functions
diff --git a/examples/source/protect.cpp b/examples/source/protect.cpp
index 4d044c6f..7ed6675d 100644
--- a/examples/source/protect.cpp
+++ b/examples/source/protect.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 int main(int, char*[]) {
 
@@ -13,16 +12,14 @@ int main(int, char*[]) {
 
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
-	lua.new_usertype<protect_me>("protect_me", 
-		"gen", sol::protect( &protect_me::gen )
-	);
+	lua.new_usertype<protect_me>("protect_me", "gen", sol::protect(&protect_me::gen));
 
 	lua.script(R"__(
 	pm = protect_me.new()
 	value = pcall(pm.gen,"wrong argument")
 	)__");
 	bool value = lua["value"];
-	c_assert(!value);
+	sol_c_assert(!value);
 
 	return 0;
 }
diff --git a/examples/source/protected_functions.cpp b/examples/source/protected_functions.cpp
index 7e217fc6..a73b05d6 100644
--- a/examples/source/protected_functions.cpp
+++ b/examples/source/protected_functions.cpp
@@ -39,7 +39,7 @@ int main() {
 		sol::error err = result;
 		std::string what = err.what();
 		std::cout << "call failed, sol::error::what() is " << what << std::endl;
-		// 'what' Should read 
+		// 'what' Should read
 		// "Handled this message: negative number detected"
 	}
 
diff --git a/examples/source/read_only.cpp b/examples/source/read_only.cpp
index 27af9b2c..78dd0981 100644
--- a/examples/source/read_only.cpp
+++ b/examples/source/read_only.cpp
@@ -4,46 +4,46 @@
 #include <iostream>
 
 struct object {
-    void my_func() {
-        std::cout << "hello\n";
-    }
+	void my_func() {
+		std::cout << "hello\n";
+	}
 };
 
 int deny(lua_State* L) {
-    return luaL_error(L, "HAH! Deniiiiied!");
+	return luaL_error(L, "HAH! Deniiiiied!");
 }
 
 int main(int, char*[]) {
 
-    sol::state lua;
-    lua.open_libraries(sol::lib::base);
+	sol::state lua;
+	lua.open_libraries(sol::lib::base);
 
-    object my_obj;
+	object my_obj;
 
-    sol::table obj_table = lua.create_named_table("object");
+	sol::table obj_table = lua.create_named_table("object");
 
-    sol::table obj_metatable = lua.create_table_with();
-    obj_metatable.set_function("my_func", &object::my_func, &my_obj);
-    // Set whatever else you need to
-    // on the obj_metatable, 
-    // not on the obj_table itself!
+	sol::table obj_metatable = lua.create_table_with();
+	obj_metatable.set_function("my_func", &object::my_func, &my_obj);
+	// Set whatever else you need to
+	// on the obj_metatable,
+	// not on the obj_table itself!
 
-    // Properly self-index metatable to block things
-    obj_metatable[sol::meta_function::new_index] = deny;
-    obj_metatable[sol::meta_function::index] = obj_metatable;
+	// Properly self-index metatable to block things
+	obj_metatable[sol::meta_function::new_index] = deny;
+	obj_metatable[sol::meta_function::index] = obj_metatable;
 
-    // Set it on the actual table
-    obj_table[sol::metatable_key] = obj_metatable;
+	// Set it on the actual table
+	obj_table[sol::metatable_key] = obj_metatable;
 
-    try {
-        lua.script(R"(
+	try {
+		lua.script(R"(
 print(object.my_func)
 object["my_func"] = 24
 print(object.my_func)
         )");
-    }
-    catch (const std::exception& e) {
-        std::cout << "an expected error occurred: " << e.what() << std::endl;
-    }
-    return 0;
+	}
+	catch (const std::exception& e) {
+		std::cout << "an expected error occurred: " << e.what() << std::endl;
+	}
+	return 0;
 }
\ No newline at end of file
diff --git a/examples/source/require.cpp b/examples/source/require.cpp
index 0b485ad7..41615f29 100644
--- a/examples/source/require.cpp
+++ b/examples/source/require.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 
 struct some_class {
@@ -12,16 +11,14 @@ sol::table open_mylib(sol::this_state s) {
 	sol::state_view lua(s);
 
 	sol::table module = lua.create_table();
-	module["func"] = []() { 
+	module["func"] = []() {
 		/* super cool function here */
 		return 2;
 	};
 	// register a class too
-	module.new_usertype<some_class>("some_class",
-		"bark", &some_class::bark
-	);
+	module.new_usertype<some_class>("some_class", "bark", &some_class::bark);
 
- 	return module;
+	return module;
 }
 
 int main() {
@@ -43,7 +40,7 @@ s.bark = 20
 )");
 
 	some_class& s = lua["s"];
-	c_assert(s.bark == 20);
+	sol_c_assert(s.bark == 20);
 	std::cout << "s.bark = " << s.bark << std::endl;
 
 	std::cout << std::endl;
diff --git a/examples/source/require_override_behavior.cpp b/examples/source/require_override_behavior.cpp
index 2af8dd02..7689fff2 100644
--- a/examples/source/require_override_behavior.cpp
+++ b/examples/source/require_override_behavior.cpp
@@ -3,7 +3,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 #include <iostream>
 #include <exception>
@@ -42,26 +41,28 @@ int main() {
 	// need package for package/searchers/require
 	lua.open_libraries(sol::lib::base, sol::lib::package);
 
-	lua.clear_package_loaders( );
+	lua.clear_package_loaders();
 	lua.add_package_loader(LoadFileRequire);
 
-	// this will call our function for 
+	// this will call our function for
 	// the searcher and it will succeed
 	auto a_result = lua.safe_script(R"(
 		local a = require("a")
 		print(a)
 		print(test)
-	)", sol::script_pass_on_error);
-	c_assert(a_result.valid());
+	)",
+	     sol::script_pass_on_error);
+	sol_c_assert(a_result.valid());
 	try {
 		// this will always fail
 		auto b_result = lua.safe_script(R"(
 			local b = require("b")
 			print(b)
-		)", sol::script_throw_on_error);
+		)",
+		     sol::script_throw_on_error);
 		// this will not be executed because of the throw,
 		// but it better be true regardless!
-		c_assert(!b_result.valid());
+		sol_c_assert(!b_result.valid());
 	}
 	catch (const std::exception& ex) {
 		// Whenever sol3 throws an exception from panic,
diff --git a/examples/source/runtime_additions.cpp b/examples/source/runtime_additions.cpp
index 720eb588..8fc322e3 100644
--- a/examples/source/runtime_additions.cpp
+++ b/examples/source/runtime_additions.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 
 struct object {
@@ -17,9 +16,9 @@ int main(int, char*[]) {
 	lua.new_usertype<object>("object");
 
 	// runtime additions: through the sol API
-	lua["object"]["func"] = [](object& o) { 
-		++o.value; 
-		return o.value; 
+	lua["object"]["func"] = [](object& o) {
+		++o.value;
+		return o.value;
 	};
 	// runtime additions: through a lua script
 	lua.script(R"(
@@ -35,7 +34,7 @@ obj:print()
 	)");
 
 	object& obj = lua["obj"];
-	c_assert(obj.value == 1);
+	sol_c_assert(obj.value == 1);
 
 	return 0;
 }
diff --git a/examples/source/script_error_handling.cpp b/examples/source/script_error_handling.cpp
index ed8bcb4d..6b28ef52 100644
--- a/examples/source/script_error_handling.cpp
+++ b/examples/source/script_error_handling.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 
 int main(int, char**) {
@@ -27,7 +26,7 @@ return 24
 			int value = lua.script(code, sol::script_default_on_error);
 			// This will never be reached
 			std::cout << value << std::endl;
-			c_assert(value == 24);
+			sol_c_assert(value == 24);
 		}
 		catch (const sol::error& err) {
 			std::cout << "Something went horribly wrong: thrown error"
@@ -42,7 +41,7 @@ return 24
 	// This will check code validity and also whether or not it runs well
 	{
 		sol::protected_function_result result = lua.script(code, sol::script_pass_on_error);
-		c_assert(!result.valid());
+		sol_c_assert(!result.valid());
 		if (!result.valid()) {
 			sol::error err = result;
 			sol::call_status status = result.status();
@@ -61,7 +60,7 @@ return 24
 	// The two previous approaches are recommended
 	{
 		sol::load_result loaded_chunk = lua.load(code);
-		c_assert(!loaded_chunk.valid());
+		sol_c_assert(!loaded_chunk.valid());
 		if (!loaded_chunk.valid()) {
 			sol::error err = loaded_chunk;
 			sol::load_status status = loaded_chunk.status();
@@ -70,7 +69,7 @@ return 24
 		}
 		else {
 			// Because the syntax is bad, this will never be reached
-			c_assert(false);
+			sol_c_assert(false);
 			// If there is a runtime error (lua GC memory error, nil access, etc.)
 			// it will be caught here
 			sol::protected_function script_func = loaded_chunk.get<sol::protected_function>();
diff --git a/examples/source/self_from_lua.cpp b/examples/source/self_from_lua.cpp
index 96a34b01..d2b7c483 100644
--- a/examples/source/self_from_lua.cpp
+++ b/examples/source/self_from_lua.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 // NOTE:
 // There are TWO ways to retrieve the "this"
@@ -19,7 +18,7 @@ int main() {
 
 			// definitely the same
 			thing& self = selfobj.as<thing>();
-			c_assert(&self == this);
+			sol_c_assert(&self == this);
 		}
 
 		void func(sol::this_state ts) const {
@@ -32,7 +31,7 @@ int main() {
 			thing& self = selfobj.as<thing>();
 
 			// definitely the same
-			c_assert(&self == this);
+			sol_c_assert(&self == this);
 		}
 	};
 
diff --git a/examples/source/shared_ptr.cpp b/examples/source/shared_ptr.cpp
index 8f1cce6b..b0e754cd 100644
--- a/examples/source/shared_ptr.cpp
+++ b/examples/source/shared_ptr.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 #include <iostream>
 
@@ -42,9 +41,7 @@ int main() {
 	std::cout << "=== shared_ptr support ===" << std::endl;
 
 	sol::state lua;
-	lua.new_usertype<my_type>("my_type",
-		"value", &my_type::value
-		);
+	lua.new_usertype<my_type>("my_type", "value", &my_type::value);
 	{
 		std::shared_ptr<my_type> shared = std::make_shared<my_type>();
 		lua["shared"] = std::move(shared);
@@ -58,16 +55,16 @@ int main() {
 		my_type* ptr_to_my_type = lua["shared"];
 		std::cout << "\tafter getting pointer to my_type: " << ref_to_shared_ptr.use_count() << std::endl;
 
-		c_assert(ptr_to_my_type == ref_to_shared_ptr.get());
-		c_assert(&ref_to_my_type == ref_to_shared_ptr.get());
-		c_assert(ref_to_shared_ptr->value == 10);
+		sol_c_assert(ptr_to_my_type == ref_to_shared_ptr.get());
+		sol_c_assert(&ref_to_my_type == ref_to_shared_ptr.get());
+		sol_c_assert(ref_to_shared_ptr->value == 10);
 
 		// script affects all of them equally
 		lua.script("shared.value = 20");
 
-		c_assert(ptr_to_my_type->value == 20);
-		c_assert(ref_to_my_type.value == 20);
-		c_assert(ref_to_shared_ptr->value == 20);
+		sol_c_assert(ptr_to_my_type->value == 20);
+		sol_c_assert(ref_to_my_type.value == 20);
+		sol_c_assert(ref_to_shared_ptr->value == 20);
 	}
 	{
 		std::cout << "getting copy of shared_ptr..." << std::endl;
@@ -76,14 +73,14 @@ int main() {
 		my_type copy_of_value = lua["shared"];
 		std::cout << "\tafter getting value copy of my_type: " << copy_of_shared_ptr.use_count() << std::endl;
 
-		c_assert(copy_of_shared_ptr->value == 20);
-		c_assert(copy_of_value.value == 20);
+		sol_c_assert(copy_of_shared_ptr->value == 20);
+		sol_c_assert(copy_of_value.value == 20);
 
 		// script still affects pointer, but does not affect copy of `my_type`
 		lua.script("shared.value = 30");
 
-		c_assert(copy_of_shared_ptr->value == 30);
-		c_assert(copy_of_value.value == 20);
+		sol_c_assert(copy_of_shared_ptr->value == 30);
+		sol_c_assert(copy_of_value.value == 20);
 	}
 	// set to nil and collect garbage to destroy it
 	lua.script("shared = nil");
diff --git a/examples/source/shared_ptr_inheritance.cpp b/examples/source/shared_ptr_inheritance.cpp
index fbd57c30..97cc852e 100644
--- a/examples/source/shared_ptr_inheritance.cpp
+++ b/examples/source/shared_ptr_inheritance.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <memory>
 #include <iostream>
 
@@ -9,7 +8,7 @@ struct Shape {
 	virtual ~Shape() = default;
 };
 
-struct Box : Shape {};
+struct Box : Shape { };
 
 SOL_BASE_CLASSES(Box, Shape);
 SOL_DERIVED_CLASSES(Shape, Box);
@@ -40,7 +39,7 @@ int main() {
 	});
 
 	sol::protected_function_result result = lua.safe_script("inspect_shape_table({shape=Box.new()})");
-	c_assert(result.valid());
+	sol_c_assert(result.valid());
 
 	return 0;
 }
diff --git a/examples/source/shared_ptr_modify_in_place.cpp b/examples/source/shared_ptr_modify_in_place.cpp
index b116705a..3ca1e1d5 100644
--- a/examples/source/shared_ptr_modify_in_place.cpp
+++ b/examples/source/shared_ptr_modify_in_place.cpp
@@ -5,8 +5,10 @@
 
 struct ree {
 	int value = 1;
-	ree() {}
-	ree(int v) : value(v) {}
+	ree() {
+	}
+	ree(int v) : value(v) {
+	}
 };
 
 int main() {
@@ -17,9 +19,7 @@ int main() {
 
 	auto new_shared_ptr = [](sol::stack_reference obj) {
 		// works just fine
-		sol::stack::modify_unique_usertype(obj, [](std::shared_ptr<ree>& sptr) {
-			sptr = std::make_shared<ree>(sptr->value + 1);
-		});
+		sol::stack::modify_unique_usertype(obj, [](std::shared_ptr<ree>& sptr) { sptr = std::make_shared<ree>(sptr->value + 1); });
 	};
 
 	auto reset_shared_ptr = [](sol::stack_reference obj) {
@@ -35,9 +35,7 @@ int main() {
 
 	lua.set_function("f", new_shared_ptr);
 	lua.set_function("f2", reset_shared_ptr);
-	lua.set_function("g", [](ree* r) {
-		std::cout << r->value << std::endl;
-	});
+	lua.set_function("g", [](ree* r) { std::cout << r->value << std::endl; });
 
 	lua["p"] = std::make_shared<ree>();
 	lua.script("g(p) -- okay");
@@ -46,7 +44,7 @@ int main() {
 	// uncomment the below for
 	// segfault/read-access violation
 	lua.script("f2(p)");
-	//lua.script("g(p) -- kaboom");
+	// lua.script("g(p) -- kaboom");
 
 	return 0;
 }
diff --git a/examples/source/singleton.cpp b/examples/source/singleton.cpp
index 81ea2a3e..b2c7d49f 100644
--- a/examples/source/singleton.cpp
+++ b/examples/source/singleton.cpp
@@ -8,7 +8,9 @@
 
 struct SomeLib {
 private:
-	SomeLib() {}
+	SomeLib() {
+	}
+
 public:
 	static std::shared_ptr<SomeLib> getInstance();
 
@@ -16,12 +18,13 @@ public:
 		return 20;
 	}
 
-	// destructor must be public to work with 
+	// destructor must be public to work with
 	// std::shared_ptr and friends
 	// if you need it to be private, you must implement
 	// a custom deleter with access to the private members
 	// (e.g., a deleter struct defined in this class)
-	~SomeLib() {}
+	~SomeLib() {
+	}
 };
 
 std::shared_ptr<SomeLib> SomeLib::getInstance() {
@@ -45,11 +48,7 @@ int main(int, char*[]) {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	lua.new_usertype<SomeLib>("SomeLib",
-		"new", sol::no_constructor,
-		"getInstance", &SomeLib::getInstance,
-		"doSomething", &SomeLib::doSomething
-		);
+	lua.new_usertype<SomeLib>("SomeLib", "new", sol::no_constructor, "getInstance", &SomeLib::getInstance, "doSomething", &SomeLib::doSomething);
 
 	lua.script(R"(
 
diff --git a/examples/source/stack_aligned_function.cpp b/examples/source/stack_aligned_function.cpp
index e7112d15..d37bf0b0 100644
--- a/examples/source/stack_aligned_function.cpp
+++ b/examples/source/stack_aligned_function.cpp
@@ -1,9 +1,8 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	sol::state lua;
 	lua.script("function func (a, b) return (a + b) * 2 end");
 
@@ -27,8 +26,8 @@ int main(int, char* []) {
 	int result = func(sol::stack_count(2));
 
 	// make sure everything is clean
-	c_assert(result == 22);
-	c_assert(lua.stack_top() == 0); // stack is empty/balanced
+	sol_c_assert(result == 22);
+	sol_c_assert(lua.stack_top() == 0); // stack is empty/balanced
 
 	return 0;
 }
diff --git a/examples/source/stack_aligned_stack_handler_function.cpp b/examples/source/stack_aligned_stack_handler_function.cpp
index 13f1b94a..bd788da0 100644
--- a/examples/source/stack_aligned_stack_handler_function.cpp
+++ b/examples/source/stack_aligned_stack_handler_function.cpp
@@ -1,9 +1,8 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	sol::state lua;
 	lua.script("function func (a, b) return (a + b) * 2 end");
 
@@ -38,8 +37,8 @@ int main(int, char* []) {
 	traceback_handler.pop();
 
 	// make sure everything is clean
-	c_assert(result == 22);
-	c_assert(lua.stack_top() == 0); // stack is empty/balanced
+	sol_c_assert(result == 22);
+	sol_c_assert(lua.stack_top() == 0); // stack is empty/balanced
 
 	return 0;
 }
diff --git a/examples/source/static_variables.cpp b/examples/source/static_variables.cpp
index 686eb0dd..fa200e29 100644
--- a/examples/source/static_variables.cpp
+++ b/examples/source/static_variables.cpp
@@ -2,7 +2,6 @@
 #include <sol/sol.hpp>
 
 #include <iostream>
-#include "assert.hpp"
 
 struct test {
 	static int muh_variable;
@@ -15,23 +14,19 @@ int main() {
 
 	sol::state lua;
 	lua.open_libraries();
-	lua.new_usertype<test>("test",
-		"direct", sol::var(2),
-		"global", sol::var(test::muh_variable),
-		"ref_global", sol::var(std::ref(test::muh_variable))
-	);
+	lua.new_usertype<test>("test", "direct", sol::var(2), "global", sol::var(test::muh_variable), "ref_global", sol::var(std::ref(test::muh_variable)));
 
 	int direct_value = lua["test"]["direct"];
 	// direct_value == 2
-	c_assert(direct_value == 2);
+	sol_c_assert(direct_value == 2);
 	std::cout << "direct_value: " << direct_value << std::endl;
 
 	int global = lua["test"]["global"];
 	int global2 = lua["test"]["ref_global"];
 	// global == 25
 	// global2 == 25
-	c_assert(global == 25);
-	c_assert(global2 == 25);
+	sol_c_assert(global == 25);
+	sol_c_assert(global2 == 25);
 
 	std::cout << "First round of values --" << std::endl;
 	std::cout << global << std::endl;
@@ -50,8 +45,8 @@ int main() {
 	// if muh_variable goes out of scope or is deleted
 	// problems could arise, so be careful!
 
-	c_assert(global == 25);
-	c_assert(global2 == 542);
+	sol_c_assert(global == 25);
+	sol_c_assert(global2 == 542);
 
 	std::cout << "Second round of values --" << std::endl;
 	std::cout << "global : " << global << std::endl;
diff --git a/examples/source/table_as_container.cpp b/examples/source/table_as_container.cpp
index d040d397..6b1f3742 100644
--- a/examples/source/table_as_container.cpp
+++ b/examples/source/table_as_container.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 struct Vector {
 	int x;
@@ -23,11 +22,11 @@ int main() {
 	lua.script("vectors = { Vector.new(3, 6), Vector.new(6, 3) }");
 	auto vectors = lua["vectors"].get<std::vector<Vector>>();
 
-	c_assert(vectors[0].x == 3);
-	c_assert(vectors[0].y == 6);
+	sol_c_assert(vectors[0].x == 3);
+	sol_c_assert(vectors[0].y == 6);
 
-	c_assert(vectors[1].x == 6);
-	c_assert(vectors[1].y == 3);
+	sol_c_assert(vectors[1].x == 6);
+	sol_c_assert(vectors[1].y == 3);
 
 	return 0;
 }
diff --git a/examples/source/table_create_if_nil.cpp b/examples/source/table_create_if_nil.cpp
index 0ccc47ca..b1664647 100644
--- a/examples/source/table_create_if_nil.cpp
+++ b/examples/source/table_create_if_nil.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 
 void create_namespace_sf(sol::state& lua) {
@@ -25,14 +24,14 @@ int main(int, char*[]) {
 
 	auto result = lua.safe_script(code, sol::script_pass_on_error);
 	// did not work
-	c_assert(!result.valid());
+	sol_c_assert(!result.valid());
 
 	// create values
 	create_namespace_sf(lua);
 
 	auto result2 = lua.safe_script(code, sol::script_pass_on_error);
 	// it worked properly
-	c_assert(result2.valid());
+	sol_c_assert(result2.valid());
 
 	std::cout << std::endl;
 
diff --git a/examples/source/table_proxy.cpp b/examples/source/table_proxy.cpp
index bc0f2775..a333ba4f 100644
--- a/examples/source/table_proxy.cpp
+++ b/examples/source/table_proxy.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 int main() {
 
@@ -27,14 +26,14 @@ int main() {
 
 	// retrivies value inside of lua table above
 	std::string value = z;
-	c_assert(value == "arf!");
+	sol_c_assert(value == "arf!");
 
 	// Can change the value later...
 	z = 20;
 
 	// Yay, lazy-evaluation!
 	int changed_value = z; // now it's 20!
-	c_assert(changed_value == 20);
+	sol_c_assert(changed_value == 20);
 	lua.script("assert(bark.woof[2] == 20)");
 
 	lua["a_new_value"] = 24;
diff --git a/examples/source/tables.cpp b/examples/source/tables.cpp
index 5aab030c..7b7cbaed 100644
--- a/examples/source/tables.cpp
+++ b/examples/source/tables.cpp
@@ -27,7 +27,7 @@ int main() {
 	/* Shorter Syntax: */
 	// using the values stored in table1
 	/*std::cout << (std::string)lua["table1"][1] << " "
-		<< (std::string)lua["table1"][2] << '\n';
+	     << (std::string)lua["table1"][2] << '\n';
 	   */
 	// some retrieval of values from the nested table
 	// the cleaner way of doing things
@@ -35,28 +35,25 @@ int main() {
 	auto t2 = lua.get<sol::table>("table2");
 	auto nestedTable = t2.get<sol::table>("nestedTable");
 	// Alternatively:
-	//sol::table t2 = lua["table2"];
-	//sol::table nestedTable = t2["nestedTable"];
-	
+	// sol::table t2 = lua["table2"];
+	// sol::table nestedTable = t2["nestedTable"];
+
 	std::string x = lua["table2"]["nestedTable"]["key2"];
-	std::cout << "nested table: key1 : " << nestedTable.get<std::string>("key1") << ", key2: "
-		<< x
-		<< '\n';
+	std::cout << "nested table: key1 : " << nestedTable.get<std::string>("key1") << ", key2: " << x << '\n';
 	std::cout << "name of t2: " << t2.get<std::string>("name") << '\n';
 	std::string t2name = t2["name"];
 	std::cout << "name of t2: " << t2name << '\n';
 
 	/* Longer Syntax: */
 	// using the values stored in table1
-	std::cout << lua.get<sol::table>("table1").get<std::string>(1) << " "
-			  << lua.get<sol::table>("table1").get<std::string>(2) << '\n';
+	std::cout << lua.get<sol::table>("table1").get<std::string>(1) << " " << lua.get<sol::table>("table1").get<std::string>(2) << '\n';
 
 	// some retrieval of values from the nested table
 	// the cleaner way of doing things
-	std::cout << "nested table: key1 : " << nestedTable.get<std::string>("key1") << ", key2: "
-	// yes you can chain the get<>() results
-			  << lua.get<sol::table>("table2").get<sol::table>("nestedTable").get<std::string>("key2")
-			  << '\n';
+	std::cout << "nested table: key1 : " << nestedTable.get<std::string>("key1")
+	          << ", key2: "
+	          // yes you can chain the get<>() results
+	          << lua.get<sol::table>("table2").get<sol::table>("nestedTable").get<std::string>("key2") << '\n';
 	std::cout << "name of t2: " << t2.get<std::string>("name") << '\n';
 
 	std::cout << std::endl;
diff --git a/examples/source/this_state.cpp b/examples/source/this_state.cpp
index 9dd91f06..4ef69412 100644
--- a/examples/source/this_state.cpp
+++ b/examples/source/this_state.cpp
@@ -1,29 +1,28 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
-int main () {
+int main() {
 	sol::state lua;
-    
-	lua.set_function("bark", []( sol::this_state s, int a, int b ){
+
+	lua.set_function("bark", [](sol::this_state s, int a, int b) {
 		lua_State* L = s; // current state
 		return a + b + lua_gettop(L);
 	});
-	
+
 	lua.script("first = bark(2, 2)"); // only takes 2 arguments, NOT 3
-		
+
 	// Can be at the end, too, or in the middle: doesn't matter
-	lua.set_function("bark", []( int a, int b, sol::this_state s ){
+	lua.set_function("bark", [](int a, int b, sol::this_state s) {
 		lua_State* L = s; // current state
 		return a + b + lua_gettop(L);
 	});
 
 	lua.script("second = bark(2, 2)"); // only takes 2 arguments
 	int first = lua["first"];
-	c_assert(first == 6);
+	sol_c_assert(first == 6);
 	int second = lua["second"];
-	c_assert(second == 6);
+	sol_c_assert(second == 6);
 
 	return 0;
 }
\ No newline at end of file
diff --git a/examples/source/tie.cpp b/examples/source/tie.cpp
index c61701bc..3f9aa1df 100644
--- a/examples/source/tie.cpp
+++ b/examples/source/tie.cpp
@@ -1,9 +1,8 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
-int main (int, char*[]) {
+int main(int, char*[]) {
 
 	const auto& code = R"(
 	bark_power = 11;
@@ -19,21 +18,21 @@ int main (int, char*[]) {
 
 	sol::function woof = lua["woof"];
 	double numwoof = woof(20);
-	c_assert(numwoof == 55.0);
+	sol_c_assert(numwoof == 55.0);
 
-	lua.script( "function f () return 10, 11, 12 end" );
+	lua.script("function f () return 10, 11, 12 end");
 
 	sol::function f = lua["f"];
 	std::tuple<int, int, int> abc = f();
-	c_assert(std::get<0>(abc) == 10);
-	c_assert(std::get<1>(abc) == 11);
-	c_assert(std::get<2>(abc) == 12);
+	sol_c_assert(std::get<0>(abc) == 10);
+	sol_c_assert(std::get<1>(abc) == 11);
+	sol_c_assert(std::get<2>(abc) == 12);
 	// or
 	int a, b, c;
 	sol::tie(a, b, c) = f();
-	c_assert(a == 10);
-	c_assert(b == 11);
-	c_assert(c == 12);
+	sol_c_assert(a == 10);
+	sol_c_assert(b == 11);
+	sol_c_assert(c == 12);
 
 	return 0;
 }
diff --git a/examples/source/tutorials/multiple_return.cpp b/examples/source/tutorials/multiple_return.cpp
new file mode 100644
index 00000000..5711549e
--- /dev/null
+++ b/examples/source/tutorials/multiple_return.cpp
@@ -0,0 +1,22 @@
+#define SOL_ALL_SAFETIES_ON 1
+#include <sol/sol.hpp>
+
+int main() {
+	sol::state lua;
+
+	lua.script("function f (a, b, c) return a, b, c end");
+
+	std::tuple<int, int, int> result;
+	result = lua["f"](1, 2, 3);
+	sol_c_assert(result == std::make_tuple(1, 2, 3));
+	int a, b;
+	std::string c;
+	// NOTE: sol::tie, NOT std::tie
+	// (ESS OH ELL prefix, not ESS TEE DEE prefix)
+	sol::tie(a, b, c) = lua["f"](1, 2, "bark");
+	sol_c_assert(a == 1);
+	sol_c_assert(b == 2);
+	sol_c_assert(c == "bark");
+
+	return 0;
+}
diff --git a/examples/source/tutorials/object_lifetime.cpp b/examples/source/tutorials/object_lifetime.cpp
index 3ed3f41b..cedf5a95 100644
--- a/examples/source/tutorials/object_lifetime.cpp
+++ b/examples/source/tutorials/object_lifetime.cpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <iostream>
 
-int main () {
+int main() {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
diff --git a/examples/source/tutorials/quick_n_dirty/arguments_to_scripts.cpp b/examples/source/tutorials/quick_n_dirty/arguments_to_scripts.cpp
index 3b144fc3..0a6dd519 100644
--- a/examples/source/tutorials/quick_n_dirty/arguments_to_scripts.cpp
+++ b/examples/source/tutorials/quick_n_dirty/arguments_to_scripts.cpp
@@ -2,9 +2,8 @@
 #include <sol/sol.hpp>
 
 #include <iostream>
-#include <assert.hpp>
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	std::cout << "=== passing arguments to scripts ===" << std::endl;
 
 	sol::state lua;
@@ -20,7 +19,7 @@ print(a,b,c)
 		sol::error err = fx;
 		std::cerr << "failed to load string-based script into the program" << err.what() << std::endl;
 	}
-	
+
 	// prints "your arguments here"
 	fx("your", "arguments", "here");
 
diff --git a/examples/source/tutorials/quick_n_dirty/functions_all.cpp b/examples/source/tutorials/quick_n_dirty/functions_all.cpp
index 822958f4..1b5b4d35 100644
--- a/examples/source/tutorials/quick_n_dirty/functions_all.cpp
+++ b/examples/source/tutorials/quick_n_dirty/functions_all.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 #include <iostream>
 
 void some_function() {
@@ -22,7 +21,7 @@ struct some_class {
 
 int main(int, char*[]) {
 	std::cout << "=== functions (all) ===" << std::endl;
-	
+
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
@@ -40,13 +39,13 @@ int main(int, char*[]) {
 	lua["m1"] = &some_class::member_function;
 
 	// binds the class to the type
-	lua.set_function("m2", &some_class::member_function, some_class{});
+	lua.set_function("m2", &some_class::member_function, some_class {});
 
 	// binds just the member variable as a function
 	lua["v1"] = &some_class::variable;
 
 	// binds class with member variable as function
-	lua.set_function("v2", &some_class::variable, some_class{});
+	lua.set_function("v2", &some_class::variable, some_class {});
 
 	lua.script(R"(
 	f1() -- some function!
diff --git a/examples/source/tutorials/quick_n_dirty/functions_easy.cpp b/examples/source/tutorials/quick_n_dirty/functions_easy.cpp
index 748cc8ed..c7c50bd3 100644
--- a/examples/source/tutorials/quick_n_dirty/functions_easy.cpp
+++ b/examples/source/tutorials/quick_n_dirty/functions_easy.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 
 int main(int, char*[]) {
 	sol::state lua;
@@ -10,7 +9,7 @@ int main(int, char*[]) {
 	lua.script("function f (a, b, c, d) return 1 end");
 	lua.script("function g (a, b) return a + b end");
 
-	// sol::function is often easier: 
+	// sol::function is often easier:
 	// takes a variable number/types of arguments...
 	sol::function fx = lua["f"];
 	// fixed signature std::function<...>
@@ -18,15 +17,15 @@ int main(int, char*[]) {
 	std::function<int(int, double, int, std::string)> stdfx = fx;
 
 	int is_one = stdfx(1, 34.5, 3, "bark");
-	c_assert(is_one == 1);
+	sol_c_assert(is_one == 1);
 	int is_also_one = fx(1, "boop", 3, "bark");
-	c_assert(is_also_one == 1);
+	sol_c_assert(is_also_one == 1);
 
 	// call through operator[]
 	int is_three = lua["g"](1, 2);
-	c_assert(is_three == 3);
+	sol_c_assert(is_three == 3);
 	double is_4_8 = lua["g"](2.4, 2.4);
-	c_assert(is_4_8 == 4.8);
+	sol_c_assert(is_4_8 == 4.8);
 
 	return 0;
 }
diff --git a/examples/source/tutorials/quick_n_dirty/make_tables.cpp b/examples/source/tutorials/quick_n_dirty/make_tables.cpp
index 2c8b9468..29c39f32 100644
--- a/examples/source/tutorials/quick_n_dirty/make_tables.cpp
+++ b/examples/source/tutorials/quick_n_dirty/make_tables.cpp
@@ -1,23 +1,19 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	lua["abc_sol2"] = lua.create_table_with(
-		0, 24
-	);
+	lua["abc_sol2"] = lua.create_table_with(0, 24);
 
-	sol::table inner_table = lua.create_table_with("bark", 50,
-		// can reference other existing stuff too
-		"woof", lua["abc_sol2"]
-	);
-	lua.create_named_table("def_sol2",
-		"ghi", inner_table
-	);
+	sol::table inner_table = lua.create_table_with("bark",
+	     50,
+	     // can reference other existing stuff too
+	     "woof",
+	     lua["abc_sol2"]);
+	lua.create_named_table("def_sol2", "ghi", inner_table);
 
 	std::string code = R"(
 		abc = { [0] = 24 }
diff --git a/examples/source/tutorials/quick_n_dirty/multiple_returns_from_lua.cpp b/examples/source/tutorials/quick_n_dirty/multiple_returns_from_lua.cpp
index 2d0d016a..a3494e1e 100644
--- a/examples/source/tutorials/quick_n_dirty/multiple_returns_from_lua.cpp
+++ b/examples/source/tutorials/quick_n_dirty/multiple_returns_from_lua.cpp
@@ -1,9 +1,8 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	sol::state lua;
 
 	lua.script("function f (a, b, c) return a, b, c end");
@@ -15,9 +14,9 @@ int main(int, char* []) {
 	int b;
 	std::string c;
 	sol::tie(a, b, c) = lua["f"](100, 200, "bark");
-	c_assert(a == 100);
-	c_assert(b == 200);
-	c_assert(c == "bark");
+	sol_c_assert(a == 100);
+	sol_c_assert(b == 200);
+	sol_c_assert(c == "bark");
 
 	return 0;
 }
diff --git a/examples/source/tutorials/quick_n_dirty/multiple_returns_to_lua.cpp b/examples/source/tutorials/quick_n_dirty/multiple_returns_to_lua.cpp
index 0a0745f3..b67f2901 100644
--- a/examples/source/tutorials/quick_n_dirty/multiple_returns_to_lua.cpp
+++ b/examples/source/tutorials/quick_n_dirty/multiple_returns_to_lua.cpp
@@ -1,9 +1,8 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
@@ -14,19 +13,19 @@ int main(int, char* []) {
 
 	std::tuple<int, int, int> result = lua["f"](100, 200, 300);
 	const std::tuple<int, int, int> expected(100, 200, 300);
-	c_assert(result == expected);
+	sol_c_assert(result == expected);
 
 	std::tuple<int, int, std::string> result2;
 	result2 = lua["f"](100, 200, "BARK BARK BARK!");
 	const std::tuple<int, int, std::string> expected2(100, 200, "BARK BARK BARK!");
-	c_assert(result2 == expected2);
+	sol_c_assert(result2 == expected2);
 
 	int a, b;
 	std::string c;
 	sol::tie(a, b, c) = lua["f"](100, 200, "bark");
-	c_assert(a == 100);
-	c_assert(b == 200);
-	c_assert(c == "bark");
+	sol_c_assert(a == 100);
+	sol_c_assert(b == 200);
+	sol_c_assert(c == "bark");
 
 	lua.script(R"(
 		a, b, c = f(150, 250, "woofbark")
diff --git a/examples/source/tutorials/quick_n_dirty/namespacing.cpp b/examples/source/tutorials/quick_n_dirty/namespacing.cpp
index 5a6f5538..494b0ecb 100644
--- a/examples/source/tutorials/quick_n_dirty/namespacing.cpp
+++ b/examples/source/tutorials/quick_n_dirty/namespacing.cpp
@@ -2,7 +2,6 @@
 #include <sol/sol.hpp>
 
 #include <iostream>
-#include <assert.hpp>
 
 int main() {
 	std::cout << "=== namespacing ===" << std::endl;
@@ -27,14 +26,12 @@ int main() {
 	// forces creation if it does not exist
 	auto bark = lua["bark"].get_or_create<sol::table>();
 	// equivalent-ish:
-	//sol::table bark = lua["bark"].force(); // forces table creation
+	// sol::table bark = lua["bark"].force(); // forces table creation
 	// equivalent, and more flexible:
-	//sol::table bark = lua["bark"].get_or_create<sol::table>(sol::new_table());
+	// sol::table bark = lua["bark"].get_or_create<sol::table>(sol::new_table());
 	// equivalent, but less efficient/ugly:
-	//sol::table bark = lua["bark"] = lua.get_or("bark", lua.create_table());
-	bark.new_usertype<my_class>("my_class",
-		"f", &my_class::f,
-		"g", &my_class::g); // the usual
+	// sol::table bark = lua["bark"] = lua.get_or("bark", lua.create_table());
+	bark.new_usertype<my_class>("my_class", "f", &my_class::f, "g", &my_class::g); // the usual
 
 	// can add functions, as well (just like the global table)
 	bark.set_function("print_my_class", [](my_class& self) { std::cout << "my_class { b: " << self.b << " }" << std::endl; });
@@ -46,7 +43,7 @@ int main() {
 	// calling this function also works
 	lua.script("bark.print_my_class(obj)");
 	my_class& obj = lua["obj"];
-	c_assert(obj.b == 25);
+	sol_c_assert(obj.b == 25);
 
 	std::cout << std::endl;
 
diff --git a/examples/source/tutorials/quick_n_dirty/opening_a_state.cpp b/examples/source/tutorials/quick_n_dirty/opening_a_state.cpp
index 390d4324..9c7a88eb 100644
--- a/examples/source/tutorials/quick_n_dirty/opening_a_state.cpp
+++ b/examples/source/tutorials/quick_n_dirty/opening_a_state.cpp
@@ -2,7 +2,6 @@
 #include <sol/sol.hpp>
 
 #include <iostream>
-#include <assert.hpp>
 
 int main(int, char*[]) {
 	std::cout << "=== opening a state ===" << std::endl;
diff --git a/examples/source/tutorials/quick_n_dirty/running_lua_code.cpp b/examples/source/tutorials/quick_n_dirty/running_lua_code.cpp
index 2ee39cb9..bc3d4142 100644
--- a/examples/source/tutorials/quick_n_dirty/running_lua_code.cpp
+++ b/examples/source/tutorials/quick_n_dirty/running_lua_code.cpp
@@ -3,7 +3,6 @@
 
 #include <fstream>
 #include <iostream>
-#include <assert.hpp>
 
 int main(int, char*[]) {
 	std::cout << "=== running lua code ===" << std::endl;
@@ -15,7 +14,7 @@ int main(int, char*[]) {
 
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
-	
+
 	// load and execute from string
 	lua.script("a = 'test'");
 	// load and execute from file
@@ -23,7 +22,7 @@ int main(int, char*[]) {
 
 	// run a script, get the result
 	int value = lua.script("return 54");
-	c_assert(value == 54);
+	sol_c_assert(value == 54);
 
 	auto bad_code_result = lua.script("123 herp.derp", [](lua_State*, sol::protected_function_result pfr) {
 		// pfr will contain things that went wrong, for either loading or executing the script
@@ -32,17 +31,15 @@ int main(int, char*[]) {
 		return pfr;
 	});
 	// it did not work
-	c_assert(!bad_code_result.valid());
-	
+	sol_c_assert(!bad_code_result.valid());
+
 	// the default handler panics or throws, depending on your settings
 	// uncomment for explosions:
-	//auto bad_code_result_2 = lua.script("bad.code", &sol::script_default_on_error);
+	// auto bad_code_result_2 = lua.script("bad.code", &sol::script_default_on_error);
 
 	std::cout << std::endl;
 
-	{
-		std::remove("a_lua_script.lua");
-	}
+	{ std::remove("a_lua_script.lua"); }
 
 	return 0;
 }
diff --git a/examples/source/tutorials/quick_n_dirty/running_lua_code_low_level.cpp b/examples/source/tutorials/quick_n_dirty/running_lua_code_low_level.cpp
index 350c779a..aba67f49 100644
--- a/examples/source/tutorials/quick_n_dirty/running_lua_code_low_level.cpp
+++ b/examples/source/tutorials/quick_n_dirty/running_lua_code_low_level.cpp
@@ -4,11 +4,10 @@
 #include <fstream>
 #include <iostream>
 #include <cstdio>
-#include <assert.hpp>
 
 int main(int, char*[]) {
 	std::cout << "=== running lua code (low level) ===" << std::endl;
-	
+
 	{
 		std::ofstream out("a_lua_script.lua");
 		out << "print('hi from a lua script file')";
@@ -19,12 +18,12 @@ int main(int, char*[]) {
 
 	// load file without execute
 	sol::load_result script1 = lua.load_file("a_lua_script.lua");
-	//execute
+	// execute
 	script1();
 
 	// load string without execute
 	sol::load_result script2 = lua.load("a = 'test'");
-	//execute
+	// execute
 	sol::protected_function_result script2result = script2();
 	// optionally, check if it worked
 	if (script2result.valid()) {
@@ -37,13 +36,11 @@ int main(int, char*[]) {
 	sol::load_result script3 = lua.load("return 24");
 	// execute, get return value
 	int value2 = script3();
-	c_assert(value2 == 24);
+	sol_c_assert(value2 == 24);
 
 	std::cout << std::endl;
 
-	{
-		std::remove("a_lua_script.lua");
-	}
+	{ std::remove("a_lua_script.lua"); }
 
 	return 0;
 }
diff --git a/examples/source/tutorials/quick_n_dirty/running_lua_code_safely.cpp b/examples/source/tutorials/quick_n_dirty/running_lua_code_safely.cpp
index 3248fd2f..7a3b20ad 100644
--- a/examples/source/tutorials/quick_n_dirty/running_lua_code_safely.cpp
+++ b/examples/source/tutorials/quick_n_dirty/running_lua_code_safely.cpp
@@ -3,7 +3,6 @@
 
 #include <fstream>
 #include <iostream>
-#include <assert.hpp>
 
 int main(int, char*[]) {
 	std::cout << "=== running lua code (safely) ===" << std::endl;
@@ -15,7 +14,7 @@ int main(int, char*[]) {
 
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
-	
+
 	// load and execute from string
 	auto result = lua.safe_script("a = 'test'", sol::script_pass_on_error);
 	if (!result.valid()) {
@@ -23,7 +22,7 @@ int main(int, char*[]) {
 		std::cerr << "The code has failed to run!\n" << err.what() << "\nPanicking and exiting..." << std::endl;
 		return 1;
 	}
-	
+
 	// load and execute from file
 	auto script_from_file_result = lua.safe_script_file("a_lua_script.lua", sol::script_pass_on_error);
 	if (!script_from_file_result.valid()) {
@@ -34,11 +33,11 @@ int main(int, char*[]) {
 
 	// run a script, get the result
 	sol::optional<int> maybe_value = lua.safe_script("return 54", sol::script_pass_on_error);
-	c_assert(maybe_value.has_value());
-	c_assert(*maybe_value == 54);
+	sol_c_assert(maybe_value.has_value());
+	sol_c_assert(*maybe_value == 54);
 
 	auto bad_code_result = lua.safe_script("123 herp.derp", sol::script_pass_on_error);
-	c_assert(!bad_code_result.valid());
+	sol_c_assert(!bad_code_result.valid());
 
 	// you can also specify a handler function, and it'll
 	// properly work here
@@ -49,17 +48,15 @@ int main(int, char*[]) {
 		return pfr;
 	});
 	// it did not work
-	c_assert(!bad_code_result2.valid());
+	sol_c_assert(!bad_code_result2.valid());
 
 	// the default handler panics or throws, depending on your settings
 	// uncomment for explosions:
-	//auto bad_code_result_2 = lua.script("bad.code", &sol::script_default_on_error);
+	// auto bad_code_result_2 = lua.script("bad.code", &sol::script_default_on_error);
 
 	std::cout << std::endl;
 
-	{
-		std::remove("a_lua_script.lua");
-	}
+	{ std::remove("a_lua_script.lua"); }
 
 	return 0;
 }
diff --git a/examples/source/tutorials/quick_n_dirty/set_and_get_variables.cpp b/examples/source/tutorials/quick_n_dirty/set_and_get_variables.cpp
index b207ff27..5c127ec9 100644
--- a/examples/source/tutorials/quick_n_dirty/set_and_get_variables.cpp
+++ b/examples/source/tutorials/quick_n_dirty/set_and_get_variables.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 
 int main(int, char*[]) {
 	sol::state lua;
@@ -44,40 +43,40 @@ int main(int, char*[]) {
 
 	// implicit conversion
 	int number = lua["number"];
-	c_assert(number == 24);
+	sol_c_assert(number == 24);
 	// explicit get
 	auto number2 = lua.get<double>("number2");
-	c_assert(number2 == 24.5);
+	sol_c_assert(number2 == 24.5);
 	// strings too
 	std::string important_string = lua["important_string"];
-	c_assert(important_string == "woof woof");
+	sol_c_assert(important_string == "woof woof");
 	// dig into a table
 	int value = lua["some_table"]["value"];
-	c_assert(value == 24);
+	sol_c_assert(value == 24);
 	// get a function
 	sol::function a_function = lua["a_function"];
 	int value_is_100 = a_function();
 	// convertible to std::function
 	std::function<int()> a_std_function = a_function;
 	int value_is_still_100 = a_std_function();
-	c_assert(value_is_100 == 100);
-	c_assert(value_is_still_100 == 100);
+	sol_c_assert(value_is_100 == 100);
+	sol_c_assert(value_is_still_100 == 100);
 
 	sol::object number_obj = lua.get<sol::object>("number");
 	// sol::type::number
 	sol::type t1 = number_obj.get_type();
-	c_assert(t1 == sol::type::number);
+	sol_c_assert(t1 == sol::type::number);
 
 	sol::object function_obj = lua["a_function"];
 	// sol::type::function
 	sol::type t2 = function_obj.get_type();
-	c_assert(t2 == sol::type::function);
+	sol_c_assert(t2 == sol::type::function);
 	bool is_it_really = function_obj.is<std::function<int()>>();
-	c_assert(is_it_really);
+	sol_c_assert(is_it_really);
 
 	// will not contain data
 	sol::optional<int> check_for_me = lua["a_function"];
-	c_assert(check_for_me == sol::nullopt);
+	sol_c_assert(check_for_me == sol::nullopt);
 
 	return 0;
 }
diff --git a/examples/source/tutorials/quick_n_dirty/set_and_get_variables_exists.cpp b/examples/source/tutorials/quick_n_dirty/set_and_get_variables_exists.cpp
index 3b751664..26a05d71 100644
--- a/examples/source/tutorials/quick_n_dirty/set_and_get_variables_exists.cpp
+++ b/examples/source/tutorials/quick_n_dirty/set_and_get_variables_exists.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 
 int main(int, char*[]) {
 	sol::state lua;
@@ -10,11 +9,11 @@ int main(int, char*[]) {
 	lua.script("exists = 250");
 
 	int first_try = lua.get_or("exists", 322);
-	c_assert(first_try == 250);
+	sol_c_assert(first_try == 250);
 
 	lua.set("exists", sol::lua_nil);
 	int second_try = lua.get_or("exists", 322);
-	c_assert(second_try == 322);
+	sol_c_assert(second_try == 322);
 
 	return 0;
 }
diff --git a/examples/source/tutorials/quick_n_dirty/tables_and_nesting.cpp b/examples/source/tutorials/quick_n_dirty/tables_and_nesting.cpp
index 47b66ff4..95a3256e 100644
--- a/examples/source/tutorials/quick_n_dirty/tables_and_nesting.cpp
+++ b/examples/source/tutorials/quick_n_dirty/tables_and_nesting.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 
 int main(int, char*[]) {
 
@@ -24,23 +23,23 @@ int main(int, char*[]) {
 
 	int bark1 = def["ghi"]["bark"];
 	int bark2 = lua["def"]["ghi"]["bark"];
-	c_assert(bark1 == 50);
-	c_assert(bark2 == 50);
+	sol_c_assert(bark1 == 50);
+	sol_c_assert(bark2 == 50);
 
 	int abcval1 = abc[0];
 	int abcval2 = ghi["woof"][0];
-	c_assert(abcval1 == 24);
-	c_assert(abcval2 == 24);
+	sol_c_assert(abcval1 == 24);
+	sol_c_assert(abcval2 == 24);
 
 	sol::optional<int> will_not_error = lua["abc"]["DOESNOTEXIST"]["ghi"];
-	c_assert(will_not_error == sol::nullopt);
-	
+	sol_c_assert(will_not_error == sol::nullopt);
+
 	int also_will_not_error = lua["abc"]["def"]["ghi"]["jklm"].get_or(25);
-	c_assert(also_will_not_error == 25);
+	sol_c_assert(also_will_not_error == 25);
 
 	// if you don't go safe,
 	// will throw (or do at_panic if no exceptions)
-	//int aaaahhh = lua["boom"]["the_dynamite"];
+	// int aaaahhh = lua["boom"]["the_dynamite"];
 
 	return 0;
 }
diff --git a/examples/source/tutorials/quick_n_dirty/userdata.cpp b/examples/source/tutorials/quick_n_dirty/userdata.cpp
index 8db4981b..34331262 100644
--- a/examples/source/tutorials/quick_n_dirty/userdata.cpp
+++ b/examples/source/tutorials/quick_n_dirty/userdata.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 #include <iostream>
 
 struct Doge {
@@ -10,8 +9,7 @@ struct Doge {
 	Doge() {
 	}
 
-	Doge(int wags)
-	: tailwag(wags) {
+	Doge(int wags) : tailwag(wags) {
 	}
 
 	~Doge() {
@@ -19,15 +17,15 @@ struct Doge {
 	}
 };
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	std::cout << "=== userdata ===" << std::endl;
 
 	sol::state lua;
 
-	Doge dog{ 30 };
+	Doge dog { 30 };
 
 	// fresh one put into Lua
-	lua["dog"] = Doge{};
+	lua["dog"] = Doge {};
 	// Copy into lua: destroyed by Lua VM during garbage collection
 	lua["dog_copy"] = dog;
 	// OR: move semantics - will call move constructor if present instead
@@ -37,8 +35,8 @@ int main(int, char* []) {
 	lua["dog_shared_ptr"] = std::make_shared<Doge>(31);
 
 	// Identical to above
-	Doge dog2{ 30 };
-	lua.set("dog2", Doge{});
+	Doge dog2 { 30 };
+	lua.set("dog2", Doge {});
 	lua.set("dog2_copy", dog2);
 	lua.set("dog2_move", std::move(dog2));
 	lua.set("dog2_unique_ptr", std::unique_ptr<Doge>(new Doge(25)));
@@ -50,20 +48,18 @@ int main(int, char* []) {
 	Doge& lua_dog_move = lua["dog_move"];
 	Doge& lua_dog_unique_ptr = lua["dog_unique_ptr"];
 	Doge& lua_dog_shared_ptr = lua["dog_shared_ptr"];
-	c_assert(lua_dog.tailwag == 50);
-	c_assert(lua_dog_copy.tailwag == 30);
-	c_assert(lua_dog_move.tailwag == 30);
-	c_assert(lua_dog_unique_ptr.tailwag == 25);
-	c_assert(lua_dog_shared_ptr.tailwag == 31);
+	sol_c_assert(lua_dog.tailwag == 50);
+	sol_c_assert(lua_dog_copy.tailwag == 30);
+	sol_c_assert(lua_dog_move.tailwag == 30);
+	sol_c_assert(lua_dog_unique_ptr.tailwag == 25);
+	sol_c_assert(lua_dog_shared_ptr.tailwag == 31);
 
 	// lua will treat these types as opaque, and you will be able to pass them around
 	// to C++ functions and Lua functions alike
 
 	// Use a C++ reference to handle memory directly
 	// otherwise take by value, without '&'
-	lua["f"] = [](Doge& dog) {
-		std::cout << "dog wags its tail " << dog.tailwag << " times!" << std::endl;
-	};
+	lua["f"] = [](Doge& dog) { std::cout << "dog wags its tail " << dog.tailwag << " times!" << std::endl; };
 
 	// if you bind a function using a pointer,
 	// you can handle when `nil` is passed
diff --git a/examples/source/tutorials/quick_n_dirty/userdata_memory_reference.cpp b/examples/source/tutorials/quick_n_dirty/userdata_memory_reference.cpp
index 648cec02..300c19d4 100644
--- a/examples/source/tutorials/quick_n_dirty/userdata_memory_reference.cpp
+++ b/examples/source/tutorials/quick_n_dirty/userdata_memory_reference.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 #include <iostream>
 
 struct Doge {
@@ -10,8 +9,7 @@ struct Doge {
 	Doge() {
 	}
 
-	Doge(int wags)
-		: tailwag(wags) {
+	Doge(int wags) : tailwag(wags) {
 	}
 
 	~Doge() {
@@ -19,13 +17,13 @@ struct Doge {
 	}
 };
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	std::cout << "=== userdata memory reference ===" << std::endl;
 
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	Doge dog{}; // Kept alive somehow
+	Doge dog {}; // Kept alive somehow
 
 	// Later...
 	// The following stores a reference, and does not copy/move
@@ -35,17 +33,15 @@ int main(int, char* []) {
 	// Same as above: respects std::reference_wrapper
 	lua["dog"] = std::ref(dog);
 	// These two are identical to above
-	lua.set( "dog", &dog );
-	lua.set( "dog", std::ref( dog ) );
+	lua.set("dog", &dog);
+	lua.set("dog", std::ref(dog));
 
 
-	Doge& dog_ref = lua["dog"]; // References Lua memory
+	Doge& dog_ref = lua["dog"];     // References Lua memory
 	Doge* dog_pointer = lua["dog"]; // References Lua memory
-	Doge dog_copy = lua["dog"]; // Copies, will not affect lua
+	Doge dog_copy = lua["dog"];     // Copies, will not affect lua
 
-	lua.new_usertype<Doge>("Doge",
-		"tailwag", &Doge::tailwag
-	);
+	lua.new_usertype<Doge>("Doge", "tailwag", &Doge::tailwag);
 
 	dog_copy.tailwag = 525;
 	// Still 50
diff --git a/examples/source/tutorials/quick_n_dirty/usertypes.cpp b/examples/source/tutorials/quick_n_dirty/usertypes.cpp
index 7a820e1a..27778e17 100644
--- a/examples/source/tutorials/quick_n_dirty/usertypes.cpp
+++ b/examples/source/tutorials/quick_n_dirty/usertypes.cpp
@@ -9,8 +9,7 @@ struct Doge {
 	Doge() {
 	}
 
-	Doge(int wags)
-	: tailwag(wags) {
+	Doge(int wags) : tailwag(wags) {
 	}
 
 	~Doge() {
@@ -18,25 +17,22 @@ struct Doge {
 	}
 };
 
-int main(int, char* []) {
+int main(int, char*[]) {
 	std::cout << "=== usertypes ===" << std::endl;
 
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
-	Doge dog{ 30 };
+	Doge dog { 30 };
 
-	lua["dog"] = Doge{};
+	lua["dog"] = Doge {};
 	lua["dog_copy"] = dog;
 	lua["dog_move"] = std::move(dog);
 	lua["dog_unique_ptr"] = std::make_unique<Doge>(21);
 	lua["dog_shared_ptr"] = std::make_shared<Doge>(51);
 
 	// now we can access these types in Lua
-	lua.new_usertype<Doge>( "Doge",
-		sol::constructors<Doge(), Doge(int)>(),
-		"tailwag", &Doge::tailwag
-	);
+	lua.new_usertype<Doge>("Doge", sol::constructors<Doge(), Doge(int)>(), "tailwag", &Doge::tailwag);
 	lua.script(R"(
 		function f (dog)
 			if dog == nil then
diff --git a/examples/source/tutorials/reading_functions.cpp b/examples/source/tutorials/reading_functions.cpp
new file mode 100644
index 00000000..58044970
--- /dev/null
+++ b/examples/source/tutorials/reading_functions.cpp
@@ -0,0 +1,29 @@
+#define SOL_ALL_SAFETIES_ON 1
+#include <sol/sol.hpp>
+
+int main() {
+
+	sol::state lua;
+
+	lua.script(R"(
+			function f (a)
+				return a + 5
+			end
+		)");
+
+	// Get and immediately call
+	int x = lua["f"](30);
+	sol_c_assert(x == 35);
+
+	// Store it into a variable first, then call
+	sol::unsafe_function f = lua["f"];
+	int y = f(20);
+	sol_c_assert(y == 25);
+
+	// Store it into a variable first, then call
+	sol::protected_function safe_f = lua["f"];
+	int z = safe_f(45);
+	sol_c_assert(z == 50);
+
+	return 0;
+}
diff --git a/examples/source/tutorials/variables_demo.cpp b/examples/source/tutorials/variables_demo.cpp
index d5228d16..e8804037 100644
--- a/examples/source/tutorials/variables_demo.cpp
+++ b/examples/source/tutorials/variables_demo.cpp
@@ -2,7 +2,6 @@
 #include <sol/sol.hpp>
 
 #include <tuple>
-#include <assert.hpp>
 #include <utility> // for std::pair
 
 int main() {
@@ -17,11 +16,11 @@ config = {
 	resolution = { x = 1024, y = 768 }
 }
 	)");
-	// the type "sol::state" behaves 
+	// the type "sol::state" behaves
 	// exactly like a table!
 	bool isfullscreen = lua["config"]["fullscreen"]; // can get nested variables
 	sol::table config = lua["config"];
-	c_assert(!isfullscreen);
+	sol_c_assert(!isfullscreen);
 
 	// can also get it using the "get" member function
 	// auto replaces the unqualified type name
@@ -29,8 +28,8 @@ config = {
 
 	// table and state can have multiple things pulled out of it too
 	std::tuple<int, int> xyresolutiontuple = resolution.get<int, int>("x", "y");
-	c_assert(std::get<0>(xyresolutiontuple) == 1024);
-	c_assert(std::get<1>(xyresolutiontuple) == 768);
+	sol_c_assert(std::get<0>(xyresolutiontuple) == 1024);
+	sol_c_assert(std::get<1>(xyresolutiontuple) == 768);
 
 	// test variable
 	auto bark = lua["config"]["bark"];
@@ -61,11 +60,11 @@ config = {
 	// (it tries to get a number, and fullscreen is
 	// not a number
 	int is_defaulted = lua["config"]["fullscreen"].get_or(24);
-	c_assert(is_defaulted == 24);
+	sol_c_assert(is_defaulted == 24);
 
 	// This will result in the value of the config, which is 'false'
 	bool is_not_defaulted = lua["config"]["fullscreen"];
-	c_assert(!is_not_defaulted);
+	sol_c_assert(!is_not_defaulted);
 
 	return 0;
 }
diff --git a/examples/source/tutorials/write_variables_demo.cpp b/examples/source/tutorials/write_variables_demo.cpp
index 22d195ae..512cfc2c 100644
--- a/examples/source/tutorials/write_variables_demo.cpp
+++ b/examples/source/tutorials/write_variables_demo.cpp
@@ -7,7 +7,7 @@ int main() {
 
 	sol::state lua;
 
-	// open those basic lua libraries 
+	// open those basic lua libraries
 	// again, for print() and other basic utilities
 	lua.open_libraries(sol::lib::base);
 
@@ -15,14 +15,11 @@ int main() {
 	lua["bark"] = 50;
 
 	// a table being created in the global table
-	lua["some_table"] = lua.create_table_with(
-		"key0", 24,
-		"key1", 25,
-		lua["bark"], "the key is 50 and this string is its value!");
+	lua["some_table"] = lua.create_table_with("key0", 24, "key1", 25, lua["bark"], "the key is 50 and this string is its value!");
 
 	// Run a plain ol' string of lua code
 	// Note you can interact with things set through sol in C++ with lua!
-	// Using a "Raw String Literal" to have multi-line goodness: 
+	// Using a "Raw String Literal" to have multi-line goodness:
 	// http://en.cppreference.com/w/cpp/language/string_literal
 	lua.script(R"(
 		
diff --git a/examples/source/tutorials/writing_functions.cpp b/examples/source/tutorials/writing_functions.cpp
new file mode 100644
index 00000000..843eba9e
--- /dev/null
+++ b/examples/source/tutorials/writing_functions.cpp
@@ -0,0 +1,28 @@
+#define SOL_ALL_SAFETIES_ON 1
+#include <sol/sol.hpp>
+
+std::string my_function(int D_count, std::string original) {
+	// Create a string with the letter 'D' "D_count" times,
+	// append it to 'original'
+	return original + std::string(D_count, 'D');
+}
+
+int main() {
+
+	sol::state lua;
+
+	lua["my_func"] = my_function;             // way 1
+	lua.set("my_func", my_function);          // way 2
+	lua.set_function("my_func", my_function); // way 3
+
+	// This function is now accessible as 'my_func' in
+	// lua scripts / code run on this state:
+	lua.script("some_str = my_func(1, 'Da')");
+
+	// Read out the global variable we stored in 'some_str' in the
+	// quick lua code we just executed
+	std::string some_str = lua["some_str"];
+	sol_c_assert(some_str == "DaD");
+
+	return 0;
+}
diff --git a/examples/source/tutorials/writing_member_functions.cpp b/examples/source/tutorials/writing_member_functions.cpp
new file mode 100644
index 00000000..c84473e9
--- /dev/null
+++ b/examples/source/tutorials/writing_member_functions.cpp
@@ -0,0 +1,50 @@
+#define SOL_ALL_SAFETIES_ON 1
+#include <sol/sol.hpp>
+
+struct my_class {
+	int a = 0;
+
+	my_class(int x) : a(x) {
+	}
+
+	int func() {
+		++a; // increment a by 1
+		return a;
+	}
+};
+
+int main() {
+
+	sol::state lua;
+	lua.open_libraries(sol::lib::base);
+
+	// Here, we are binding the member function and a class instance: it will call the function on
+	// the given class instance
+	lua.set_function("my_class_func", &my_class::func, my_class(0));
+
+	// We do not pass a class instance here:
+	// the function will need you to pass an instance of "my_class" to it
+	// in lua to work, as shown below
+	lua.set_function("my_class_func_2", &my_class::func);
+
+	// With a pre-bound instance:
+	lua.script(R"(
+			first_value = my_class_func()
+			second_value = my_class_func()
+			assert(first_value == 1)
+			assert(second_value == 2)
+		)");
+
+	// With no bound instance:
+	lua.set("obj", my_class(24));
+	// Calls "func" on the class instance
+	// referenced by "obj" in Lua
+	lua.script(R"(
+			third_value = my_class_func_2(obj)
+			fourth_value = my_class_func_2(obj)
+			assert(third_value == 25)
+			assert(fourth_value == 26)
+		)");
+
+	return 0;
+}
diff --git a/examples/source/tutorials/writing_overloaded_template_functions.cpp b/examples/source/tutorials/writing_overloaded_template_functions.cpp
new file mode 100644
index 00000000..acd5d784
--- /dev/null
+++ b/examples/source/tutorials/writing_overloaded_template_functions.cpp
@@ -0,0 +1,24 @@
+#define SOL_ALL_SAFETIES_ON 1
+#include <sol/sol.hpp>
+
+template <typename A, typename B>
+auto my_add(A a, B b) {
+	return a + b;
+}
+
+int main() {
+
+	sol::state lua;
+
+	// adds 2 integers
+	lua["my_combine"] = sol::overload(&my_add<int, int>, &my_add<std::string, std::string>);
+
+	lua.script("my_num = my_combine(1, 2)");
+	lua.script("my_str = my_combine('bark bark', ' woof woof')");
+	int my_num = lua["my_num"];
+	std::string my_str = lua["my_str"];
+	sol_c_assert(my_num == 3);
+	sol_c_assert(my_str == "bark bark woof woof");
+
+	return 0;
+}
diff --git a/examples/source/tutorials/writing_template_functions.cpp b/examples/source/tutorials/writing_template_functions.cpp
new file mode 100644
index 00000000..8b8d2528
--- /dev/null
+++ b/examples/source/tutorials/writing_template_functions.cpp
@@ -0,0 +1,28 @@
+#define SOL_ALL_SAFETIES_ON 1
+#include <sol/sol.hpp>
+
+template <typename A, typename B>
+auto my_add(A a, B b) {
+	return a + b;
+}
+
+int main() {
+
+	sol::state lua;
+
+	// adds 2 integers
+	lua["my_int_add"] = &my_add<int, int>;
+
+	// concatenates 2 strings
+	lua["my_string_combine"] = &my_add<std::string, std::string>;
+
+	lua.script("my_num = my_int_add(1, 2)");
+	int my_num = lua["my_num"];
+	sol_c_assert(my_num == 3);
+
+	lua.script("my_str = my_string_combine('bark bark', ' woof woof')");
+	std::string my_str = lua["my_str"];
+	sol_c_assert(my_str == "bark bark woof woof");
+
+	return 0;
+}
diff --git a/examples/source/unique_ptr.cpp b/examples/source/unique_ptr.cpp
index 78249074..aad53be8 100644
--- a/examples/source/unique_ptr.cpp
+++ b/examples/source/unique_ptr.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 
 #include <iostream>
 
@@ -42,9 +41,7 @@ int main() {
 	std::cout << "=== unique_ptr support ===" << std::endl;
 
 	sol::state lua;
-	lua.new_usertype<my_type>("my_type",
-		"value", &my_type::value
-		);
+	lua.new_usertype<my_type>("my_type", "value", &my_type::value);
 	{
 		std::unique_ptr<my_type> unique = std::make_unique<my_type>();
 		lua["unique"] = std::move(unique);
@@ -55,27 +52,27 @@ int main() {
 		my_type& ref_to_my_type = lua["unique"];
 		my_type* ptr_to_my_type = lua["unique"];
 
-		c_assert(ptr_to_my_type == ref_to_unique_ptr.get());
-		c_assert(&ref_to_my_type == ref_to_unique_ptr.get());
-		c_assert(ref_to_unique_ptr->value == 10);
+		sol_c_assert(ptr_to_my_type == ref_to_unique_ptr.get());
+		sol_c_assert(&ref_to_my_type == ref_to_unique_ptr.get());
+		sol_c_assert(ref_to_unique_ptr->value == 10);
 
 		// script affects all of them equally
 		lua.script("unique.value = 20");
 
-		c_assert(ptr_to_my_type->value == 20);
-		c_assert(ref_to_my_type.value == 20);
-		c_assert(ref_to_unique_ptr->value == 20);
+		sol_c_assert(ptr_to_my_type->value == 20);
+		sol_c_assert(ref_to_my_type.value == 20);
+		sol_c_assert(ref_to_unique_ptr->value == 20);
 	}
 	{
 		std::cout << "getting copy of unique_ptr..." << std::endl;
 		my_type copy_of_value = lua["unique"];
-		
-		c_assert(copy_of_value.value == 20);
+
+		sol_c_assert(copy_of_value.value == 20);
 
 		// script still affects pointer, but does not affect copy of `my_type`
 		lua.script("unique.value = 30");
 
-		c_assert(copy_of_value.value == 20);
+		sol_c_assert(copy_of_value.value == 20);
 	}
 	// set to nil and collect garbage to destroy it
 	lua.script("unique = nil");
diff --git a/examples/source/usertype.cpp b/examples/source/usertype.cpp
index 861a64e9..4cc8cd6b 100644
--- a/examples/source/usertype.cpp
+++ b/examples/source/usertype.cpp
@@ -2,116 +2,120 @@
 #include <sol/sol.hpp>
 
 #include <iostream>
-#include "assert.hpp"
 #include <cmath>
 
 struct foo {
 private:
-    std::string name;
+	std::string name;
+
 public:
-    foo(std::string name): name(std::string(name)) {}
+	foo(std::string name) : name(std::string(name)) {
+	}
 
-    void print() {
-        std::cout << name << '\n';
-    }
+	void print() {
+		std::cout << name << '\n';
+	}
 
-    int test(int x) {
-        return static_cast<int>(name.length()) + x;
-    }
+	int test(int x) {
+		return static_cast<int>(name.length()) + x;
+	}
 };
 
 struct vector {
 private:
-    float x = 0;
-    float y = 0;
-public:
-    vector() = default;
-    vector(float x): x(x) {}
-    vector(float x, float y): x(x), y(y) {}
+	float x = 0;
+	float y = 0;
 
-    bool is_unit() const {
-        return (x * x + y * y) == 1.f;
-    }
+public:
+	vector() = default;
+	vector(float x) : x(x) {
+	}
+	vector(float x, float y) : x(x), y(y) {
+	}
+
+	bool is_unit() const {
+		return (x * x + y * y) == 1.f;
+	}
 };
 
 struct variables {
-    bool low_gravity = false;
-    int boost_level = 0;
-
+	bool low_gravity = false;
+	int boost_level = 0;
 };
 
 int main() {
 	std::cout << "=== usertype ===" << std::endl;
 
-    sol::state lua;
-    lua.open_libraries(sol::lib::base, sol::lib::math);
+	sol::state lua;
+	lua.open_libraries(sol::lib::base, sol::lib::math);
 
-    // the simplest way to create a class is through
-    // sol::state::new_userdata
-    // the first template is the class type
-    // the rest are the constructor parameters
-    // using new_userdata you can only have one constructor
+	// the simplest way to create a class is through
+	// sol::state::new_userdata
+	// the first template is the class type
+	// the rest are the constructor parameters
+	// using new_userdata you can only have one constructor
 
 
-    // you must make sure that the name of the function
-    // goes before the member function pointer
-    lua.new_usertype<foo>("foo", sol::constructors<foo(std::string)>(), 
-        "print", &foo::print, 
-        "test", &foo::test);
+	// you must make sure that the name of the function
+	// goes before the member function pointer
+	lua.new_usertype<foo>("foo", sol::constructors<foo(std::string)>(), "print", &foo::print, "test", &foo::test);
 
-    // making the class from lua is simple
-    // same with calling member functions
-    lua.script("x = foo.new('test')\n"
-               "x:print()\n"
-               "y = x:test(10)");
+	// making the class from lua is simple
+	// same with calling member functions
+	lua.script(
+	     "x = foo.new('test')\n"
+	     "x:print()\n"
+	     "y = x:test(10)");
 
-    auto y = lua.get<int>("y");
-    std::cout << y << std::endl; // show 14
+	auto y = lua.get<int>("y");
+	std::cout << y << std::endl; // show 14
 
-    // if you want a class to have more than one constructor
-    // the way to do so is through set_userdata and creating
-    // a userdata yourself with constructor types
+	// if you want a class to have more than one constructor
+	// the way to do so is through set_userdata and creating
+	// a userdata yourself with constructor types
 
-    {
-        // Notice the brace: this means we're in a new scope
-        
-        // first, define the different types of constructors
-		// notice here that the return type 
+	{
+		// Notice the brace: this means we're in a new scope
+
+		// first, define the different types of constructors
+		// notice here that the return type
 		// on the function-type doesn't exactly matter,
-		// which allows you to use a shorter class name/void 
+		// which allows you to use a shorter class name/void
 		// if necessary
-        sol::constructors<vector(), vector(float), void(float, float)> ctor;
-        // then you must register it
-        sol::usertype<vector> utype = lua.new_usertype<vector>("vector", ctor);
-        
-        // add to it as much as you like
-        utype["is_unit"] = &vector::is_unit;
-        // You can throw away the usertype after 
-        // you set it: you do NOT
-        // have to keep it around
-        // cleanup happens automagically!
-    }
+		sol::constructors<vector(), vector(float), void(float, float)> ctor;
+		// then you must register it
+		sol::usertype<vector> utype = lua.new_usertype<vector>("vector", ctor);
 
-    // calling it is the same as
-    // working with userdata is C++
-    lua.script("v = vector.new()\n"
-               "v = vector.new(12)\n"
-               "v = vector.new(10, 10)\n"
-               "assert(not v:is_unit())\n");
+		// add to it as much as you like
+		utype["is_unit"] = &vector::is_unit;
+		// You can throw away the usertype after
+		// you set it: you do NOT
+		// have to keep it around
+		// cleanup happens automagically!
+	}
 
-    // You can even have C++-like member-variable-access
-    // just pass is public member variables in the same style as functions
-    lua.new_usertype<variables>("variables", "low_gravity", &variables::low_gravity, "boost_level", &variables::boost_level);
+	// calling it is the same as
+	// working with userdata is C++
+	lua.script(
+	     "v = vector.new()\n"
+	     "v = vector.new(12)\n"
+	     "v = vector.new(10, 10)\n"
+	     "assert(not v:is_unit())\n");
 
-    // making the class from lua is simple
-    // same with calling member functions/variables
-    lua.script("local vars = variables.new()\n"
-               "assert(not vars.low_gravity)\n"
-               "vars.low_gravity = true\n"
-               "local x = vars.low_gravity\n"
-               "assert(x)");
+	// You can even have C++-like member-variable-access
+	// just pass is public member variables in the same style as functions
+	lua.new_usertype<variables>("variables", "low_gravity", &variables::low_gravity, "boost_level", &variables::boost_level);
+
+	// making the class from lua is simple
+	// same with calling member functions/variables
+	lua.script(
+	     "local vars = variables.new()\n"
+	     "assert(not vars.low_gravity)\n"
+	     "vars.low_gravity = true\n"
+	     "local x = vars.low_gravity\n"
+	     "assert(x)");
 
 	std::cout << std::endl;
 
-    return 0;
+	return 0;
 }
diff --git a/examples/source/usertype_advanced.cpp b/examples/source/usertype_advanced.cpp
index af6fe66f..de63a1b0 100644
--- a/examples/source/usertype_advanced.cpp
+++ b/examples/source/usertype_advanced.cpp
@@ -12,19 +12,13 @@ public:
 	int bullets;
 	int speed;
 
-	player()
-		: player(3, 100) {
-
+	player() : player(3, 100) {
 	}
 
-	player(int ammo)
-		: player(ammo, 100) {
-
+	player(int ammo) : player(ammo, 100) {
 	}
 
-	player(int ammo, int hitpoints)
-		: bullets(ammo), hp(hitpoints) {
-
+	player(int ammo, int hitpoints) : bullets(ammo), hp(hitpoints) {
 	}
 
 	void boost() {
@@ -56,9 +50,9 @@ int main() {
 
 	lua.open_libraries(sol::lib::base);
 
-	// note that you can set a 
+	// note that you can set a
 	// userdata before you register a usertype,
-	// and it will still carry 
+	// and it will still carry
 	// the right metatable if you register it later
 
 	// set a variable "p2" of type "player" with 0 ammo
@@ -66,8 +60,8 @@ int main() {
 
 	// make usertype metatable
 	sol::usertype<player> player_type = lua.new_usertype<player>("player",
-		// 3 constructors
-		sol::constructors<player(), player(int), player(int, int)>());
+	     // 3 constructors
+	     sol::constructors<player(), player(int), player(int, int)>());
 
 	// typical member function that returns a variable
 	player_type["shoot"] = &player::shoot;
diff --git a/examples/source/usertype_automatic_operators.cpp b/examples/source/usertype_automatic_operators.cpp
index 6e996cb4..f7cfa13a 100644
--- a/examples/source/usertype_automatic_operators.cpp
+++ b/examples/source/usertype_automatic_operators.cpp
@@ -21,22 +21,28 @@ public:
 	}
 
 	// automatically used for pairs(obj) [ __pairs ], 5.2+
-	iterator begin() const { return data.begin(); }
-	iterator end() const { return data.end(); }
+	iterator begin() const {
+		return data.begin();
+	}
+	iterator end() const {
+		return data.end();
+	}
 
 	// automatically bound to #obj [ __len ]
-	size_type size() const { return data.size(); }
+	size_type size() const {
+		return data.size();
+	}
 
 	// automatically bound for obj == obj [ __eq ]
-	bool operator== (const automatic& right) const {
+	bool operator==(const automatic& right) const {
 		return data == right.data;
 	}
 	// automatically bound for obj < obj [ __lt ]
-	bool operator< (const automatic& right) const {
+	bool operator<(const automatic& right) const {
 		return data < right.data;
 	}
 	// automatically bound for obj <= obj [ __le ]
-	bool operator<= (const automatic& right) const {
+	bool operator<=(const automatic& right) const {
 		return data <= right.data;
 	}
 	// other comparison operators are based off the above in Lua
diff --git a/examples/source/usertype_basics.cpp b/examples/source/usertype_basics.cpp
index c3254108..319d31b7 100644
--- a/examples/source/usertype_basics.cpp
+++ b/examples/source/usertype_basics.cpp
@@ -7,7 +7,7 @@ struct ship {
 	int bullets = 20;
 	int life = 100;
 
-	bool shoot () {
+	bool shoot() {
 		if (bullets > 0) {
 			--bullets;
 			// successfully shot
@@ -17,7 +17,7 @@ struct ship {
 		return false;
 	}
 
-	bool hurt (int by) {
+	bool hurt(int by) {
 		life -= by;
 		// have we died?
 		return life < 1;
@@ -25,7 +25,7 @@ struct ship {
 };
 
 
-int main () {
+int main() {
 
 	std::cout << "=== usertype basics ===" << std::endl;
 
@@ -35,22 +35,25 @@ int main () {
 	lua.open_libraries(sol::lib::base);
 
 	if (way_1) {
-		lua.new_usertype<ship>( "ship", // the name of the class, as you want it to be used in lua
-			// List the member functions you wish to bind:
-			// "name_of_item", &class_name::function_or_variable
-			"shoot", &ship::shoot,
-			"hurt", &ship::hurt,
-			// bind variable types, too
-			"life", &ship::life,
-			// names in lua don't have to be the same as C++,
-			// but it probably helps if they're kept the same,
-			// here we change it just to show its possible
-			"bullet_count", &ship::bullets
-		);
+		lua.new_usertype<ship>("ship", // the name of the class, as you want it to be used in lua
+		                               // List the member functions you wish to bind:
+		                               // "name_of_item", &class_name::function_or_variable
+		     "shoot",
+		     &ship::shoot,
+		     "hurt",
+		     &ship::hurt,
+		     // bind variable types, too
+		     "life",
+		     &ship::life,
+		     // names in lua don't have to be the same as C++,
+		     // but it probably helps if they're kept the same,
+		     // here we change it just to show its possible
+		     "bullet_count",
+		     &ship::bullets);
 	}
 	else {
 		// set usertype explicitly, with the given name
-		sol::usertype<ship> usertype_table = lua.new_usertype<ship>( "ship");
+		sol::usertype<ship> usertype_table = lua.new_usertype<ship>("ship");
 		usertype_table["shoot"] = &ship::shoot;
 		usertype_table["hurt"] = &ship::hurt;
 		usertype_table["life"] = &ship::life;
diff --git a/examples/source/usertype_bitfields.cpp b/examples/source/usertype_bitfields.cpp
index 7d8e0ab9..73e5fb31 100644
--- a/examples/source/usertype_bitfields.cpp
+++ b/examples/source/usertype_bitfields.cpp
@@ -56,7 +56,8 @@ namespace itsy_bitsy {
 		typedef bit_type_t<sizeof(Base) * CHAR_BIT> aligned_type;
 		static const std::size_t aligned_type_bit_size = sizeof(aligned_type) * CHAR_BIT;
 		static_assert(sizeof(Base) * CHAR_BIT >= (bit_target + size), "bit offset and size are too large for the desired structure.");
-		static_assert((bit_target % aligned_type_bit_size) <= ((bit_target + size) % aligned_type_bit_size), "bit offset and size cross beyond largest integral constant boundary.");
+		static_assert((bit_target % aligned_type_bit_size) <= ((bit_target + size) % aligned_type_bit_size),
+		     "bit offset and size cross beyond largest integral constant boundary.");
 
 		const std::size_t aligned_target = (bit_target + size) / aligned_type_bit_size;
 		const aligned_type bits_left = static_cast<aligned_type>(bit_target - aligned_target);
@@ -77,7 +78,8 @@ namespace itsy_bitsy {
 		typedef bit_type_t<size> field_type;
 		static const std::size_t aligned_type_bit_size = sizeof(aligned_type) * CHAR_BIT;
 		static_assert(sizeof(Base) * CHAR_BIT >= (bit_target + size), "bit offset and size are too large for the desired structure.");
-		static_assert((bit_target % aligned_type_bit_size) <= ((bit_target + size) % aligned_type_bit_size), "bit offset and size cross beyond largest integral constant boundary.");
+		static_assert((bit_target % aligned_type_bit_size) <= ((bit_target + size) % aligned_type_bit_size),
+		     "bit offset and size cross beyond largest integral constant boundary.");
 
 		const std::size_t aligned_target = (bit_target + size) / aligned_type_bit_size;
 		const aligned_type bits_left = static_cast<aligned_type>(bit_target - aligned_target);
@@ -92,10 +94,9 @@ namespace itsy_bitsy {
 		return bits;
 	}
 
-}
+} // namespace itsy_bitsy
 
 #include <iostream>
-#include "assert.hpp"
 
 #if defined(_MSC_VER) || defined(__MINGW32__)
 #pragma pack(1)
@@ -112,7 +113,7 @@ struct __attribute__((packed, aligned(1))) flags_t {
 	uint8_t Z : 1;
 	uint8_t S : 1;
 	uint16_t D : 14;
-} flags{0, 0, 0, 0, 0, 0, 0, 0, 0};
+} flags { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
 int main() {
 	std::cout << "=== usertype_bitfields ===" << std::endl;
@@ -123,10 +124,12 @@ int main() {
 	lua.open_libraries();
 
 	lua.new_usertype<flags_t>("flags_t",
-		"C", sol::property(itsy_bitsy::read<flags_t, 0>, itsy_bitsy::write<flags_t, 0>),
-		"N", sol::property(itsy_bitsy::read<flags_t, 1>, itsy_bitsy::write<flags_t, 1>),
-		"D", sol::property(itsy_bitsy::read<flags_t, 8, 14>, itsy_bitsy::write<flags_t, 8, 14>)
-	);
+	     "C",
+	     sol::property(itsy_bitsy::read<flags_t, 0>, itsy_bitsy::write<flags_t, 0>),
+	     "N",
+	     sol::property(itsy_bitsy::read<flags_t, 1>, itsy_bitsy::write<flags_t, 1>),
+	     "D",
+	     sol::property(itsy_bitsy::read<flags_t, 8, 14>, itsy_bitsy::write<flags_t, 8, 14>));
 
 	lua["f"] = std::ref(flags);
 
@@ -147,16 +150,16 @@ int main() {
 	bool C = flags.C;
 	bool N = flags.N;
 	uint16_t D = flags.D;
-	
+
 	std::cout << std::hex;
 	std::cout << "sizeof(flags): " << sizeof(flags) << std::endl;
 	std::cout << "C: " << C << std::endl;
 	std::cout << "N: " << N << std::endl;
 	std::cout << "D: " << D << std::endl;
 
-	c_assert(C);
-	c_assert(N);
-	c_assert(D == 0xDF);
+	sol_c_assert(C);
+	sol_c_assert(N);
+	sol_c_assert(D == 0xDF);
 
 	std::cout << std::endl;
 
diff --git a/examples/source/usertype_call_from_c++.cpp b/examples/source/usertype_call_from_c++.cpp
index f65282c8..6701b2fb 100644
--- a/examples/source/usertype_call_from_c++.cpp
+++ b/examples/source/usertype_call_from_c++.cpp
@@ -5,7 +5,7 @@
 
 int main(int, char*[]) {
 	std::cout << "=== usertype call from C++ ===" << std::endl;
-	
+
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 
@@ -23,15 +23,11 @@ int main(int, char*[]) {
 		}
 	};
 
-	lua.new_usertype<cpp_object>("test",
-		"value", &cpp_object::value
-		);
-	lua.new_usertype<test>("test",
-		"func", &test::func
-		);
+	lua.new_usertype<cpp_object>("test", "value", &cpp_object::value);
+	lua.new_usertype<test>("test", "func", &test::func);
 	lua.script("function test:lua_func(obj) print('lua_func', obj.value) end");
 
-	lua["obj"] = test{};
+	lua["obj"] = test {};
 	cpp_object cppobj;
 
 	lua["obj"]["func"](lua["obj"], cppobj);
@@ -41,12 +37,12 @@ int main(int, char*[]) {
 	lua["test"]["lua_func"](lua["obj"], cppobj);
 
 	// crashes
-	//lua["obj"]["func"](cppobj);
-	//lua["obj"]["lua_func"](cppobj);
+	// lua["obj"]["func"](cppobj);
+	// lua["obj"]["lua_func"](cppobj);
 
 	// crashes
-	//lua["test"]["func"](cppobj);
-	//lua["test"]["lua_func"](cppobj);
+	// lua["test"]["func"](cppobj);
+	// lua["test"]["lua_func"](cppobj);
 
 	return 0;
 }
\ No newline at end of file
diff --git a/examples/source/usertype_dynamic_get_set.cpp b/examples/source/usertype_dynamic_get_set.cpp
index 61003ea4..e2f82fe8 100644
--- a/examples/source/usertype_dynamic_get_set.cpp
+++ b/examples/source/usertype_dynamic_get_set.cpp
@@ -2,7 +2,6 @@
 #include <sol/sol.hpp>
 
 #include <iostream>
-#include "assert.hpp"
 #include <cmath>
 
 // Note that this is a bunch of if/switch statements
@@ -17,9 +16,12 @@ struct vec {
 	double x;
 	double y;
 
-	vec() : x(0), y(0) {}
-	vec(double x) : vec(x, x) {}
-	vec(double x, double y) : x(x), y(y) {}
+	vec() : x(0), y(0) {
+	}
+	vec(double x) : vec(x, x) {
+	}
+	vec(double x, double y) : x(x), y(y) {
+	}
 
 	sol::object get(sol::stack_object key, sol::this_state L) {
 		// we use stack_object for the arguments because we know
@@ -103,17 +105,18 @@ int main() {
 	lua.open_libraries();
 
 	lua.new_usertype<vec>("vec",
-		sol::constructors<vec(), vec(double), vec(double, double)>(),
-		// index and newindex control what happens when a "key"
-		// is looked up that is not baked into the class itself
-		// it is called with the object and the key for index (get)s
-		// or it is called with the object, the key, and the index (set)
-		// we can use a member function to assume the "object" is of the `vec`
-		// type, and then just have a function that takes 
-		// the key (get) or the key + the value (set)
-		sol::meta_function::index, &vec::get,
-		sol::meta_function::new_index, &vec::set
-		);
+	     sol::constructors<vec(), vec(double), vec(double, double)>(),
+	     // index and newindex control what happens when a "key"
+	     // is looked up that is not baked into the class itself
+	     // it is called with the object and the key for index (get)s
+	     // or it is called with the object, the key, and the index (set)
+	     // we can use a member function to assume the "object" is of the `vec`
+	     // type, and then just have a function that takes
+	     // the key (get) or the key + the value (set)
+	     sol::meta_function::index,
+	     &vec::get,
+	     sol::meta_function::new_index,
+	     &vec::set);
 
 	lua.script(R"(
 		v1 = vec.new(1, 0)
@@ -149,8 +152,8 @@ int main() {
 	sol::userdata v1 = lua["v1"];
 	double v1x = v1["x"];
 	double v1y = v1["y"];
-	c_assert(v1x == 1.000);
-	c_assert(v1y == 0.000);
+	sol_c_assert(v1x == 1.000);
+	sol_c_assert(v1y == 0.000);
 	v1[0] = 2.000;
 
 	lua.script(R"(
diff --git a/examples/source/usertype_initializers.cpp b/examples/source/usertype_initializers.cpp
index 1a135833..f14428f0 100644
--- a/examples/source/usertype_initializers.cpp
+++ b/examples/source/usertype_initializers.cpp
@@ -3,13 +3,15 @@
 
 #include <memory>
 #include <iostream>
-#include "assert.hpp"
 
 struct holy {
 private:
-	holy() : data() {}
-	holy(int value) : data(value) {}
-	~holy() {}
+	holy() : data() {
+	}
+	holy(int value) : data(value) {
+	}
+	~holy() {
+	}
 
 public:
 	struct deleter {
@@ -47,11 +49,14 @@ int main() {
 		lua.open_libraries();
 
 		lua.new_usertype<holy>("holy",
-			"new", sol::initializers(&holy::initialize),
-			"create", sol::factories(&holy::create),
-			sol::meta_function::garbage_collect, sol::destructor(&holy::destroy),
-			"data", &holy::data
-		);
+		     "new",
+		     sol::initializers(&holy::initialize),
+		     "create",
+		     sol::factories(&holy::create),
+		     sol::meta_function::garbage_collect,
+		     sol::destructor(&holy::destroy),
+		     "data",
+		     &holy::data);
 
 		lua.script(R"(
 h1 = holy.create()
@@ -61,8 +66,8 @@ print('h2.data is ' .. h2.data)
 )");
 		holy& h1 = lua["h1"];
 		holy& h2 = lua["h2"];
-		c_assert(h1.data == 50);
-		c_assert(h2.data == 0);
+		sol_c_assert(h1.data == 50);
+		sol_c_assert(h2.data == 0);
 	}
 	std::cout << std::endl;
 }
\ No newline at end of file
diff --git a/examples/source/usertype_special_functions.cpp b/examples/source/usertype_special_functions.cpp
index e9f57986..2ccd767e 100644
--- a/examples/source/usertype_special_functions.cpp
+++ b/examples/source/usertype_special_functions.cpp
@@ -1,15 +1,16 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <cmath>
 
 struct vec {
 	double x;
 	double y;
 
-	vec() : x(0), y(0) {}
-	vec(double x, double y) : x(x), y(y) {}
+	vec() : x(0), y(0) {
+	}
+	vec(double x, double y) : x(x), y(y) {
+	}
 
 	vec operator-(const vec& right) const {
 		return vec(x - right.x, y - right.y);
@@ -28,15 +29,22 @@ int main() {
 	sol::state lua;
 	lua.open_libraries();
 
-	lua.new_usertype<vec>("vec", 
-		sol::constructors<vec(), vec(double, double)>(),
-		"dot", &dot,
-		"norm", [](const vec& self) { double len = std::sqrt(dot(self, self)); return vec(self.x / len, self.y / len); },
-		// we use `sol::resolve` because other operator+ can exist
-		// in the (global) namespace
-		sol::meta_function::addition, sol::resolve<vec(const vec&, const vec&)>(::operator+),
-		sol::meta_function::subtraction, &vec::operator-
-	);
+	lua.new_usertype<vec>(
+	     "vec",
+	     sol::constructors<vec(), vec(double, double)>(),
+	     "dot",
+	     &dot,
+	     "norm",
+	     [](const vec& self) {
+		     double len = std::sqrt(dot(self, self));
+		     return vec(self.x / len, self.y / len);
+	     },
+	     // we use `sol::resolve` because other operator+ can exist
+	     // in the (global) namespace
+	     sol::meta_function::addition,
+	     sol::resolve<vec(const vec&, const vec&)>(::operator+),
+	     sol::meta_function::subtraction,
+	     &vec::operator-);
 
 	lua.script(R"(
 		v1 = vec.new(1, 0)
@@ -57,8 +65,8 @@ int main() {
 	vec& a1 = lua["a1"];
 	vec& s1 = lua["s1"];
 
-	c_assert(a1.x == 1 && a1.y == 1);
-	c_assert(s1.x == 1 && s1.y == -1);
+	sol_c_assert(a1.x == 1 && a1.y == 1);
+	sol_c_assert(s1.x == 1 && s1.y == -1);
 
 	lua["a2"] = lua["a1"];
 
diff --git a/examples/source/usertype_var.cpp b/examples/source/usertype_var.cpp
index 9a3c4658..8c62882a 100644
--- a/examples/source/usertype_var.cpp
+++ b/examples/source/usertype_var.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include "assert.hpp"
 #include <iostream>
 
 struct test {
@@ -13,33 +12,29 @@ int test::number = 25;
 int main() {
 	sol::state lua;
 	lua.open_libraries();
-	lua.new_usertype<test>("test",
-		"direct", sol::var(2),
-		"number", sol::var(test::number),
-		"ref_number", sol::var(std::ref(test::number))
-	);
+	lua.new_usertype<test>("test", "direct", sol::var(2), "number", sol::var(test::number), "ref_number", sol::var(std::ref(test::number)));
 
 	int direct_value = lua["test"]["direct"];
-	c_assert(direct_value == 2);
+	sol_c_assert(direct_value == 2);
 
 	int number = lua["test"]["number"];
-	c_assert(number == 25);
+	sol_c_assert(number == 25);
 	int ref_number = lua["test"]["ref_number"];
-	c_assert(ref_number == 25);
-	
+	sol_c_assert(ref_number == 25);
+
 	test::number = 542;
 
 	// number is its own memory: was passed by value
 	// So does not change
 	int number_again = lua["test"]["number"];
-	c_assert(number_again == 25);
+	sol_c_assert(number_again == 25);
 
-	// ref_number is just test::number 
+	// ref_number is just test::number
 	// passed through std::ref
 	// so, it holds a reference
 	// which can be updated
 	int ref_number_again = lua["test"]["ref_number"];
-	c_assert(ref_number_again == 542);
+	sol_c_assert(ref_number_again == 542);
 	// be careful about referencing local variables,
 	// if they go out of scope but are still reference
 	// you'll suffer dangling reference bugs!
diff --git a/examples/source/variables.cpp b/examples/source/variables.cpp
index 2c796880..247aeed5 100644
--- a/examples/source/variables.cpp
+++ b/examples/source/variables.cpp
@@ -6,34 +6,34 @@
 int main() {
 	std::cout << "=== variables ===" << std::endl;
 
-    sol::state lua;
+	sol::state lua;
 
-    // need the base library for assertions
-    lua.open_libraries(sol::lib::base);
+	// need the base library for assertions
+	lua.open_libraries(sol::lib::base);
 
-    // basic setting of a variable
-    // through multiple ways
-    lua["x"] = 10;
-    lua.set("y", "hello");
+	// basic setting of a variable
+	// through multiple ways
+	lua["x"] = 10;
+	lua.set("y", "hello");
 
-    // assert values are as given
-    lua.script("assert(x == 10)");
-    lua.script("assert(y == 'hello')");
+	// assert values are as given
+	lua.script("assert(x == 10)");
+	lua.script("assert(y == 'hello')");
 
 
-    // basic retrieval of a variable
-    // through multiple ways
-    int x = lua["x"];
-    auto y = lua.get<std::string>("y");
+	// basic retrieval of a variable
+	// through multiple ways
+	int x = lua["x"];
+	auto y = lua.get<std::string>("y");
 
-    int x2;
-    std::string y2;
-    std::tie(x2, y2) = lua.get<int, std::string>("x", "y");
+	int x2;
+	std::string y2;
+	std::tie(x2, y2) = lua.get<int, std::string>("x", "y");
 
-    // show the values
-    std::cout << x << std::endl;
-    std::cout << y << std::endl;
-    std::cout << x2 << std::endl;
-    std::cout << y2 << std::endl;
+	// show the values
+	std::cout << x << std::endl;
+	std::cout << y << std::endl;
+	std::cout << x2 << std::endl;
+	std::cout << y2 << std::endl;
 	std::cout << std::endl;
 }
\ No newline at end of file
diff --git a/examples/source/variadic_args_shifted.cpp b/examples/source/variadic_args_shifted.cpp
index c08d7116..33f53c83 100644
--- a/examples/source/variadic_args_shifted.cpp
+++ b/examples/source/variadic_args_shifted.cpp
@@ -3,8 +3,8 @@
 
 #include <iostream>
 
-int main () {
-	
+int main() {
+
 	std::cout << "=== variadic_args shifting constructor ===" << std::endl;
 
 	sol::state lua;
@@ -19,12 +19,12 @@ int main () {
 		}
 		return r;
 	});
-    
+
 	lua.script("x = f(1, 2, 3, 4)");
 	lua.script("x2 = f(8, 200, 3, 4)");
 	lua.script("x3 = f(1, 2, 3, 4, 5, 6)");
-	
-	lua.script("print(x)"); // 7
+
+	lua.script("print(x)");  // 7
 	lua.script("print(x2)"); // 7
 	lua.script("print(x3)"); // 18
 
diff --git a/examples/source/variadic_args_storage.cpp b/examples/source/variadic_args_storage.cpp
index fb1a94be..876c0e6b 100644
--- a/examples/source/variadic_args_storage.cpp
+++ b/examples/source/variadic_args_storage.cpp
@@ -10,17 +10,15 @@ int main() {
 
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
-	
+
 	std::function<void()> function_storage;
 
-	auto store_routine = [&function_storage] (sol::function f, sol::variadic_args va) {
-		function_storage = [f, args = std::vector<sol::object>(va.begin(), va.end())]() {
-			f(sol::as_args(args));
-		};
+	auto store_routine = [&function_storage](sol::function f, sol::variadic_args va) {
+		function_storage = [f, args = std::vector<sol::object>(va.begin(), va.end())]() { f(sol::as_args(args)); };
 	};
 
 	lua.set_function("store_routine", store_routine);
-	
+
 	lua.script(R"(
 function a(name)
 	print(name)
diff --git a/examples/source/wip/lua_inheritance.cpp b/examples/source/wip/lua_inheritance.cpp
index 5aa32e20..0d0e3804 100644
--- a/examples/source/wip/lua_inheritance.cpp
+++ b/examples/source/wip/lua_inheritance.cpp
@@ -1,7 +1,6 @@
 #define SOL_ALL_SAFETIES_ON 1
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 #include <iostream>
 
 int main(int, char*[]) {
@@ -11,7 +10,7 @@ int main(int, char*[]) {
 	lua.open_libraries(sol::lib::base);
 
 	/* This example is currently under construction.
-	For inheritance and classes within Lua, 
+	For inheritance and classes within Lua,
 	consider using kikito's middleclass
 	-- https://github.com/kikito/middleclass */
 
diff --git a/include/sol/as_args.hpp b/include/sol/as_args.hpp
index 99315bcd..2307d629 100644
--- a/include/sol/as_args.hpp
+++ b/include/sol/as_args.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/as_returns.hpp b/include/sol/as_returns.hpp
index b9daafba..2a2ae089 100644
--- a/include/sol/as_returns.hpp
+++ b/include/sol/as_returns.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/assert.hpp b/include/sol/assert.hpp
new file mode 100644
index 00000000..dc464389
--- /dev/null
+++ b/include/sol/assert.hpp
@@ -0,0 +1,99 @@
+// sol3
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy of
+// this software and associated documentation files (the "Software"), to deal in
+// the Software without restriction, including without limitation the rights to
+// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+// the Software, and to permit persons to whom the Software is furnished to do so,
+// subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+#pragma once
+
+#ifndef SOL_ASSERT_HPP
+#define SOL_ASSERT_HPP
+
+#include <sol/forward.hpp>
+
+#if SOL_IS_ON(SOL2_CI_I_)
+
+struct pre_main {
+	pre_main() {
+#ifdef _MSC_VER
+		_set_abort_behavior(0, _WRITE_ABORT_MSG);
+#endif
+	}
+} pm;
+
+#endif // Prevent lockup when doing Continuous Integration
+
+
+// clang-format off
+
+#if SOL_IS_ON(SOL_USER_C_ASSERT_I_)
+	#define sol_c_assert(...) SOL_C_ASSERT(__VA_ARGS__)
+#else
+	#if SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#include <exception>
+		#include <iostream>
+		#include <cstdlib>
+
+			#define sol_c_assert(...)                                                                                               \
+				do {                                                                                                               \
+					if (!(__VA_ARGS__)) {                                                                                           \
+						std::cerr << "Assertion `" #__VA_ARGS__ "` failed in " << __FILE__ << " line " << __LINE__ << std::endl; \
+						std::terminate();                                                                                        \
+					}                                                                                                             \
+				} while (false)
+	#else
+		#define sol_c_assert(...)           \
+			do {                           \
+				if (false) {              \
+					(void)(__VA_ARGS__); \
+				}                         \
+			} while (false)
+	#endif
+#endif
+
+#if SOL_IS_ON(SOL_USER_M_ASSERT_I_)
+	#define sol_m_assert(message, ...) SOL_M_ASSERT(message, __VA_ARGS__)
+#else
+	#if SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#include <exception>
+		#include <iostream>
+		#include <cstdlib>
+
+		#define sol_m_assert(message, ...)                                                                                                         \
+			do {                                                                                                                                  \
+				if (!(__VA_ARGS__)) {                                                                                                              \
+					std::cerr << "Assertion `" #__VA_ARGS__ "` failed in " << __FILE__ << " line " << __LINE__ << ": " << message << std::endl; \
+					std::terminate();                                                                                                           \
+				}                                                                                                                                \
+			} while (false)
+	#else
+		#define sol_m_assert(message, ...)    \
+			do {                             \
+				if (false) {                \
+					(void)(__VA_ARGS__);   \
+					(void)sizeof(message); \
+				}                           \
+			} while (false)
+	#endif
+#endif
+
+// clang-format on
+
+#endif // SOL_ASSERT_HPP
diff --git a/include/sol/base_traits.hpp b/include/sol/base_traits.hpp
index 746ed9a3..7e1ceef9 100644
--- a/include/sol/base_traits.hpp
+++ b/include/sol/base_traits.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/bind_traits.hpp b/include/sol/bind_traits.hpp
index ba8beefa..dc0e4ca2 100644
--- a/include/sol/bind_traits.hpp
+++ b/include/sol/bind_traits.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/bytecode.hpp b/include/sol/bytecode.hpp
index fc3a2fd2..22d9c1fe 100644
--- a/include/sol/bytecode.hpp
+++ b/include/sol/bytecode.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/call.hpp b/include/sol/call.hpp
index 95a9e567..6ed45221 100644
--- a/include/sol/call.hpp
+++ b/include/sol/call.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -21,6 +21,8 @@
 // IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+#pragma once
+
 #ifndef SOL_CALL_HPP
 #define SOL_CALL_HPP
 
diff --git a/include/sol/compatibility.hpp b/include/sol/compatibility.hpp
index 1ef761f3..bd827b14 100644
--- a/include/sol/compatibility.hpp
+++ b/include/sol/compatibility.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/compatibility/lua_version.hpp b/include/sol/compatibility/lua_version.hpp
index 81c611c2..b7d233f7 100644
--- a/include/sol/compatibility/lua_version.hpp
+++ b/include/sol/compatibility/lua_version.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/config.hpp b/include/sol/config.hpp
index 607b9fba..164644d9 100644
--- a/include/sol/config.hpp
+++ b/include/sol/config.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/coroutine.hpp b/include/sol/coroutine.hpp
index 74b985f8..823808a5 100644
--- a/include/sol/coroutine.hpp
+++ b/include/sol/coroutine.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/debug.hpp b/include/sol/debug.hpp
index 8589072a..58b5c6f3 100644
--- a/include/sol/debug.hpp
+++ b/include/sol/debug.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/demangle.hpp b/include/sol/demangle.hpp
index f2a8c2c6..9aa0ac5c 100644
--- a/include/sol/demangle.hpp
+++ b/include/sol/demangle.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/deprecate.hpp b/include/sol/deprecate.hpp
index 7ced918a..28779cb0 100644
--- a/include/sol/deprecate.hpp
+++ b/include/sol/deprecate.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/dump_handler.hpp b/include/sol/dump_handler.hpp
index b8eb9a44..9a209579 100644
--- a/include/sol/dump_handler.hpp
+++ b/include/sol/dump_handler.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/ebco.hpp b/include/sol/ebco.hpp
index cb44b957..59b21fa9 100644
--- a/include/sol/ebco.hpp
+++ b/include/sol/ebco.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -49,8 +49,9 @@ namespace sol { namespace detail {
 			return *this;
 		};
 		template <typename Arg, typename... Args,
-			typename = std::enable_if_t<!std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
-			                                 ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
+			typename = std::enable_if_t<
+			     !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
+			          ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
 		ebco(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<T, Arg, Args...>)
 		: m_value(std::forward<Arg>(arg), std::forward<Args>(args)...) {
 		}
@@ -76,8 +77,9 @@ namespace sol { namespace detail {
 		ebco(const T& v) noexcept(std::is_nothrow_copy_constructible_v<T>) : T(v) {};
 		ebco(T&& v) noexcept(std::is_nothrow_move_constructible_v<T>) : T(std::move(v)) {};
 		template <typename Arg, typename... Args,
-			typename = std::enable_if_t<!std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
-			                                 ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
+			typename = std::enable_if_t<
+			     !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
+			          ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
 		ebco(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<T, Arg, Args...>) : T(std::forward<Arg>(arg), std::forward<Args>(args)...) {
 		}
 
diff --git a/include/sol/environment.hpp b/include/sol/environment.hpp
index 0141f9de..ff1f5850 100644
--- a/include/sol/environment.hpp
+++ b/include/sol/environment.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -159,11 +159,11 @@ namespace sol {
 			return static_cast<bool>(env);
 		}
 
-		operator optional<environment> &() {
+		operator optional<environment>&() {
 			return env;
 		}
 
-		operator const optional<environment> &() const {
+		operator const optional<environment>&() const {
 			return env;
 		}
 
diff --git a/include/sol/error.hpp b/include/sol/error.hpp
index e79fb4a0..3888bc64 100644
--- a/include/sol/error.hpp
+++ b/include/sol/error.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/error_handler.hpp b/include/sol/error_handler.hpp
index 9a2dc47a..bd56a18e 100644
--- a/include/sol/error_handler.hpp
+++ b/include/sol/error_handler.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/forward.hpp b/include/sol/forward.hpp
index 0c89532e..6421cd9a 100644
--- a/include/sol/forward.hpp
+++ b/include/sol/forward.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/forward_detail.hpp b/include/sol/forward_detail.hpp
index 48325e6f..c6849e0a 100644
--- a/include/sol/forward_detail.hpp
+++ b/include/sol/forward_detail.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/function.hpp b/include/sol/function.hpp
index 3f319b84..d4c0aa9d 100644
--- a/include/sol/function.hpp
+++ b/include/sol/function.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/function_result.hpp b/include/sol/function_result.hpp
index 9339f6aa..2d1e455e 100644
--- a/include/sol/function_result.hpp
+++ b/include/sol/function_result.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/function_types.hpp b/include/sol/function_types.hpp
index d131357e..0ce19302 100644
--- a/include/sol/function_types.hpp
+++ b/include/sol/function_types.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/function_types_core.hpp b/include/sol/function_types_core.hpp
index e9a3c2a8..a04fc866 100644
--- a/include/sol/function_types_core.hpp
+++ b/include/sol/function_types_core.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/function_types_overloaded.hpp b/include/sol/function_types_overloaded.hpp
index 87d3d4d0..0d2d0fb4 100644
--- a/include/sol/function_types_overloaded.hpp
+++ b/include/sol/function_types_overloaded.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/function_types_stateful.hpp b/include/sol/function_types_stateful.hpp
index 01a37915..f15040cd 100644
--- a/include/sol/function_types_stateful.hpp
+++ b/include/sol/function_types_stateful.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/function_types_stateless.hpp b/include/sol/function_types_stateless.hpp
index 9d81d116..ab70a602 100644
--- a/include/sol/function_types_stateless.hpp
+++ b/include/sol/function_types_stateless.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/function_types_templated.hpp b/include/sol/function_types_templated.hpp
index 7ce7fef2..fed6c88c 100644
--- a/include/sol/function_types_templated.hpp
+++ b/include/sol/function_types_templated.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/in_place.hpp b/include/sol/in_place.hpp
index cf3a22f8..d98bc9aa 100644
--- a/include/sol/in_place.hpp
+++ b/include/sol/in_place.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/inheritance.hpp b/include/sol/inheritance.hpp
index 9d066ff8..6683046d 100644
--- a/include/sol/inheritance.hpp
+++ b/include/sol/inheritance.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/load_result.hpp b/include/sol/load_result.hpp
index 6449d999..aef0dcae 100644
--- a/include/sol/load_result.hpp
+++ b/include/sol/load_result.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/lua_table.hpp b/include/sol/lua_table.hpp
index 98400aee..58f02e54 100644
--- a/include/sol/lua_table.hpp
+++ b/include/sol/lua_table.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/lua_value.hpp b/include/sol/lua_value.hpp
index d9c6b7e8..a505a1a1 100644
--- a/include/sol/lua_value.hpp
+++ b/include/sol/lua_value.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/make_reference.hpp b/include/sol/make_reference.hpp
index 0ff14511..e403881d 100644
--- a/include/sol/make_reference.hpp
+++ b/include/sol/make_reference.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/metatable.hpp b/include/sol/metatable.hpp
index 46a56da5..a1539ca9 100644
--- a/include/sol/metatable.hpp
+++ b/include/sol/metatable.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/object.hpp b/include/sol/object.hpp
index 2aa65190..92325451 100644
--- a/include/sol/object.hpp
+++ b/include/sol/object.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/object_base.hpp b/include/sol/object_base.hpp
index cd344a97..d6698080 100644
--- a/include/sol/object_base.hpp
+++ b/include/sol/object_base.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/optional.hpp b/include/sol/optional.hpp
index fdc26da3..b9312954 100644
--- a/include/sol/optional.hpp
+++ b/include/sol/optional.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/optional_implementation.hpp b/include/sol/optional_implementation.hpp
index c1ef8454..baafea48 100644
--- a/include/sol/optional_implementation.hpp
+++ b/include/sol/optional_implementation.hpp
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -654,9 +654,12 @@ namespace sol {
 	/// ```
 	using std::nullopt;
 
+	/// @brief An exception for when an optional is accessed through specific methods while it is not engaged.
 	class bad_optional_access : public std::exception {
 	public:
+		/// @brief Default-constructs an optional exception.
 		bad_optional_access() = default;
+		/// @brief Returns a pointer to a null-terminated string containing the reason for the exception.
 		const char* what() const noexcept override {
 			return "Optional has no value";
 		}
diff --git a/include/sol/overload.hpp b/include/sol/overload.hpp
index 822efc57..be5ffa80 100644
--- a/include/sol/overload.hpp
+++ b/include/sol/overload.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/packaged_coroutine.hpp b/include/sol/packaged_coroutine.hpp
index b87ef729..00f11126 100644
--- a/include/sol/packaged_coroutine.hpp
+++ b/include/sol/packaged_coroutine.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/pairs_iterator.hpp b/include/sol/pairs_iterator.hpp
index c9a9d10a..7a20f33d 100644
--- a/include/sol/pairs_iterator.hpp
+++ b/include/sol/pairs_iterator.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/pointer_like.hpp b/include/sol/pointer_like.hpp
index 351d258a..6ae3f78a 100644
--- a/include/sol/pointer_like.hpp
+++ b/include/sol/pointer_like.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/policies.hpp b/include/sol/policies.hpp
index dda206a8..ad26c576 100644
--- a/include/sol/policies.hpp
+++ b/include/sol/policies.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/property.hpp b/include/sol/property.hpp
index a5c9d609..a0ddf088 100644
--- a/include/sol/property.hpp
+++ b/include/sol/property.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/protect.hpp b/include/sol/protect.hpp
index 16ba80ca..b4bb1207 100644
--- a/include/sol/protect.hpp
+++ b/include/sol/protect.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/protected_function.hpp b/include/sol/protected_function.hpp
index b55992e5..38375beb 100644
--- a/include/sol/protected_function.hpp
+++ b/include/sol/protected_function.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/protected_function_result.hpp b/include/sol/protected_function_result.hpp
index 2f34cfa8..66b09fdb 100644
--- a/include/sol/protected_function_result.hpp
+++ b/include/sol/protected_function_result.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/protected_handler.hpp b/include/sol/protected_handler.hpp
index 5aed20f8..900490ae 100644
--- a/include/sol/protected_handler.hpp
+++ b/include/sol/protected_handler.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/proxy_base.hpp b/include/sol/proxy_base.hpp
index 3b2d7784..d271f493 100644
--- a/include/sol/proxy_base.hpp
+++ b/include/sol/proxy_base.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/raii.hpp b/include/sol/raii.hpp
index 6e49581b..32444304 100644
--- a/include/sol/raii.hpp
+++ b/include/sol/raii.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/reference.hpp b/include/sol/reference.hpp
index a4d6f212..c3ee45f4 100644
--- a/include/sol/reference.hpp
+++ b/include/sol/reference.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/resolve.hpp b/include/sol/resolve.hpp
index adc89001..76dcc49d 100644
--- a/include/sol/resolve.hpp
+++ b/include/sol/resolve.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -34,7 +34,7 @@ namespace sol {
 
 	namespace detail {
 		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
-		inline constexpr auto resolve_i(types<R(Args...)>, F &&) -> R (meta::unqualified_t<F>::*)(Args...) {
+		inline constexpr auto resolve_i(types<R(Args...)>, F&&) -> R (meta::unqualified_t<F>::*)(Args...) {
 			using Sig = R(Args...);
 			typedef meta::unqualified_t<F> Fu;
 			return static_cast<Sig Fu::*>(&Fu::operator());
@@ -103,7 +103,7 @@ namespace sol {
 
 	namespace detail {
 		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
-		inline auto resolve_i(types<R(Args...)>, F &&) -> R (meta::unqualified_t<F>::*)(Args...) {
+		inline auto resolve_i(types<R(Args...)>, F&&) -> R (meta::unqualified_t<F>::*)(Args...) {
 			using Sig = R(Args...);
 			typedef meta::unqualified_t<F> Fu;
 			return static_cast<Sig Fu::*>(&Fu::operator());
diff --git a/include/sol/sol.hpp b/include/sol/sol.hpp
index b453451c..dc300883 100644
--- a/include/sol/sol.hpp
+++ b/include/sol/sol.hpp
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -47,6 +47,7 @@
 
 #include <sol/forward.hpp>
 #include <sol/forward_detail.hpp>
+#include <sol/assert.hpp>
 #include <sol/bytecode.hpp>
 #include <sol/stack.hpp>
 #include <sol/object.hpp>
diff --git a/include/sol/stack.hpp b/include/sol/stack.hpp
index 2de42639..04d4d3b2 100644
--- a/include/sol/stack.hpp
+++ b/include/sol/stack.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -147,7 +147,8 @@ namespace sol {
 			}
 
 			template <bool checked, typename Arg, typename... Args, std::size_t I, std::size_t... Is, typename Handler, typename Fx, typename... FxArgs>
-			static decltype(auto) eval(types<Arg, Args...>, std::index_sequence<I, Is...>, lua_State* L_, int start_index_, Handler&& handler_, record& tracking_, Fx&& fx_, FxArgs&&... fxargs_) {
+			static decltype(auto) eval(types<Arg, Args...>, std::index_sequence<I, Is...>, lua_State* L_, int start_index_, Handler&& handler_,
+			     record& tracking_, Fx&& fx_, FxArgs&&... fxargs_) {
 #if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS_I_)
 				// We can save performance/time by letting errors unwind produced arguments
 				// rather than checking everything once, and then potentially re-doing work
@@ -178,7 +179,8 @@ namespace sol {
 			}
 
 			template <bool checkargs = detail::default_safe_function_calls, std::size_t... I, typename R, typename... Args, typename Fx, typename... FxArgs>
-			inline decltype(auto) call(types<R>, types<Args...> argument_types_, std::index_sequence<I...> argument_indices_, lua_State* L_, int start_index_, Fx&& fx_, FxArgs&&... args_) {
+			inline decltype(auto) call(types<R>, types<Args...> argument_types_, std::index_sequence<I...> argument_indices_, lua_State* L_,
+			     int start_index_, Fx&& fx_, FxArgs&&... args_) {
 				static_assert(meta::all_v<meta::is_not_move_only<Args>...>,
 				     "One of the arguments being bound is a move-only type, and it is not being taken by reference: this will break your code. Please take "
 				     "a reference and std::move it manually if this was your intention.");
@@ -190,10 +192,12 @@ namespace sol {
 				}
 #endif
 				if constexpr (std::is_void_v<R>) {
-					eval<checkargs>(argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
+					eval<checkargs>(
+					     argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
 				}
 				else {
-					return eval<checkargs>(argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
+					return eval<checkargs>(
+					     argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
 				}
 			}
 		} // namespace stack_detail
diff --git a/include/sol/stack_check.hpp b/include/sol/stack_check.hpp
index a5aa1e52..6a02925b 100644
--- a/include/sol/stack_check.hpp
+++ b/include/sol/stack_check.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_check_get.hpp b/include/sol/stack_check_get.hpp
index 47d7e8aa..fda27ee3 100644
--- a/include/sol/stack_check_get.hpp
+++ b/include/sol/stack_check_get.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_check_get_qualified.hpp b/include/sol/stack_check_get_qualified.hpp
index 2fadaf8d..25018112 100644
--- a/include/sol/stack_check_get_qualified.hpp
+++ b/include/sol/stack_check_get_qualified.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_check_get_unqualified.hpp b/include/sol/stack_check_get_unqualified.hpp
index ca78d310..6763ce5f 100644
--- a/include/sol/stack_check_get_unqualified.hpp
+++ b/include/sol/stack_check_get_unqualified.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_check_qualified.hpp b/include/sol/stack_check_qualified.hpp
index 80f29075..536cf424 100644
--- a/include/sol/stack_check_qualified.hpp
+++ b/include/sol/stack_check_qualified.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_check_unqualified.hpp b/include/sol/stack_check_unqualified.hpp
index 5019a2b1..b69cf000 100644
--- a/include/sol/stack_check_unqualified.hpp
+++ b/include/sol/stack_check_unqualified.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_core.hpp b/include/sol/stack_core.hpp
index 5534fbf0..2b7341b7 100644
--- a/include/sol/stack_core.hpp
+++ b/include/sol/stack_core.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_field.hpp b/include/sol/stack_field.hpp
index bb5b7a80..d2d1d077 100644
--- a/include/sol/stack_field.hpp
+++ b/include/sol/stack_field.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_get.hpp b/include/sol/stack_get.hpp
index 5b724d10..76774d45 100644
--- a/include/sol/stack_get.hpp
+++ b/include/sol/stack_get.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_get_qualified.hpp b/include/sol/stack_get_qualified.hpp
index 0aa98aed..ff12b6d5 100644
--- a/include/sol/stack_get_qualified.hpp
+++ b/include/sol/stack_get_qualified.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_get_unqualified.hpp b/include/sol/stack_get_unqualified.hpp
index 3b9cfea5..323e688f 100644
--- a/include/sol/stack_get_unqualified.hpp
+++ b/include/sol/stack_get_unqualified.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_guard.hpp b/include/sol/stack_guard.hpp
index 2096c767..6ffc4d6e 100644
--- a/include/sol/stack_guard.hpp
+++ b/include/sol/stack_guard.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_iterator.hpp b/include/sol/stack_iterator.hpp
index a17a387b..f1bcd5c0 100644
--- a/include/sol/stack_iterator.hpp
+++ b/include/sol/stack_iterator.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_pop.hpp b/include/sol/stack_pop.hpp
index 45b61482..5df00b85 100644
--- a/include/sol/stack_pop.hpp
+++ b/include/sol/stack_pop.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_probe.hpp b/include/sol/stack_probe.hpp
index c2d4eeef..7a1fb759 100644
--- a/include/sol/stack_probe.hpp
+++ b/include/sol/stack_probe.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_proxy.hpp b/include/sol/stack_proxy.hpp
index 7e720456..e0173530 100644
--- a/include/sol/stack_proxy.hpp
+++ b/include/sol/stack_proxy.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_proxy_base.hpp b/include/sol/stack_proxy_base.hpp
index 758b4fff..2cc5a752 100644
--- a/include/sol/stack_proxy_base.hpp
+++ b/include/sol/stack_proxy_base.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_push.hpp b/include/sol/stack_push.hpp
index 01c54054..b050c1c8 100644
--- a/include/sol/stack_push.hpp
+++ b/include/sol/stack_push.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/stack_reference.hpp b/include/sol/stack_reference.hpp
index b05e18bf..aa3d50f7 100644
--- a/include/sol/stack_reference.hpp
+++ b/include/sol/stack_reference.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/state.hpp b/include/sol/state.hpp
index e2e9091d..4e22c4fd 100644
--- a/include/sol/state.hpp
+++ b/include/sol/state.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/state_handling.hpp b/include/sol/state_handling.hpp
index 7751d045..c40c2897 100644
--- a/include/sol/state_handling.hpp
+++ b/include/sol/state_handling.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/state_view.hpp b/include/sol/state_view.hpp
index 3bd18ef4..8f48e36e 100644
--- a/include/sol/state_view.hpp
+++ b/include/sol/state_view.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/string_view.hpp b/include/sol/string_view.hpp
index d621554f..87ae03f1 100644
--- a/include/sol/string_view.hpp
+++ b/include/sol/string_view.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/table.hpp b/include/sol/table.hpp
index 37047f2c..3cb69338 100644
--- a/include/sol/table.hpp
+++ b/include/sol/table.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/table_core.hpp b/include/sol/table_core.hpp
index d26053e7..ba64a3be 100644
--- a/include/sol/table_core.hpp
+++ b/include/sol/table_core.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/table_iterator.hpp b/include/sol/table_iterator.hpp
index 1e030e3b..613d2535 100644
--- a/include/sol/table_iterator.hpp
+++ b/include/sol/table_iterator.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/table_proxy.hpp b/include/sol/table_proxy.hpp
index eda5556e..0dec0e5b 100644
--- a/include/sol/table_proxy.hpp
+++ b/include/sol/table_proxy.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/thread.hpp b/include/sol/thread.hpp
index d4f89b40..dd57d268 100644
--- a/include/sol/thread.hpp
+++ b/include/sol/thread.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/tie.hpp b/include/sol/tie.hpp
index bc7169ef..ffc3d2b6 100644
--- a/include/sol/tie.hpp
+++ b/include/sol/tie.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/traits.hpp b/include/sol/traits.hpp
index e2a914f2..6c78fb67 100644
--- a/include/sol/traits.hpp
+++ b/include/sol/traits.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/trampoline.hpp b/include/sol/trampoline.hpp
index 24e2e222..29480b0a 100644
--- a/include/sol/trampoline.hpp
+++ b/include/sol/trampoline.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/tuple.hpp b/include/sol/tuple.hpp
index 16d645f0..ae1b42be 100644
--- a/include/sol/tuple.hpp
+++ b/include/sol/tuple.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/types.hpp b/include/sol/types.hpp
index 849213e9..345316ad 100644
--- a/include/sol/types.hpp
+++ b/include/sol/types.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/unicode.hpp b/include/sol/unicode.hpp
index 2d463d66..3eedb70d 100644
--- a/include/sol/unicode.hpp
+++ b/include/sol/unicode.hpp
@@ -92,8 +92,10 @@ namespace sol {
 			}
 
 			static constexpr int sequence_length(unsigned char b) {
-				return (b & start_2byte_mask) == 0 ? 1
-				                                   : (b & start_3byte_mask) != start_3byte_mask ? 2 : (b & start_4byte_mask) != start_4byte_mask ? 3 : 4;
+				return (b & start_2byte_mask) == 0                ? 1
+				     : (b & start_3byte_mask) != start_3byte_mask ? 2
+				     : (b & start_4byte_mask) != start_4byte_mask ? 3
+				                                                  : 4;
 			}
 
 			static constexpr char32_t decode(unsigned char b0, unsigned char b1) {
diff --git a/include/sol/unique_usertype_traits.hpp b/include/sol/unique_usertype_traits.hpp
index 22c6e877..9dd22723 100644
--- a/include/sol/unique_usertype_traits.hpp
+++ b/include/sol/unique_usertype_traits.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -169,7 +169,8 @@ namespace sol {
 		template <typename T>
 		constexpr bool unique_is_null_noexcept() noexcept {
 			if constexpr (meta::meta_detail::unique_usertype_is_null_with_state_v<std::remove_cv_t<T>>) {
-				return noexcept(unique_usertype_traits<T>::is_null(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+				return noexcept(
+				     unique_usertype_traits<T>::is_null(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
 			}
 			else {
 				return noexcept(unique_usertype_traits<T>::is_null(std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
@@ -190,7 +191,8 @@ namespace sol {
 		template <typename T>
 		constexpr bool unique_get_noexcept() noexcept {
 			if constexpr (meta::meta_detail::unique_usertype_get_with_state_v<std::remove_cv_t<T>>) {
-				return noexcept(unique_usertype_traits<T>::get(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+				return noexcept(
+				     unique_usertype_traits<T>::get(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
 			}
 			else {
 				return noexcept(unique_usertype_traits<T>::get(std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
diff --git a/include/sol/unsafe_function.hpp b/include/sol/unsafe_function.hpp
index 999a2e9b..3b364ed2 100644
--- a/include/sol/unsafe_function.hpp
+++ b/include/sol/unsafe_function.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/unsafe_function_result.hpp b/include/sol/unsafe_function_result.hpp
index d2fc1312..671dbe51 100644
--- a/include/sol/unsafe_function_result.hpp
+++ b/include/sol/unsafe_function_result.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/userdata.hpp b/include/sol/userdata.hpp
index 23ec2adf..36fc90b9 100644
--- a/include/sol/userdata.hpp
+++ b/include/sol/userdata.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/usertype.hpp b/include/sol/usertype.hpp
index 2ae9afc4..1eadef33 100644
--- a/include/sol/usertype.hpp
+++ b/include/sol/usertype.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/usertype_container.hpp b/include/sol/usertype_container.hpp
index 5ba8e47d..9c2f3e91 100644
--- a/include/sol/usertype_container.hpp
+++ b/include/sol/usertype_container.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/usertype_container_launch.hpp b/include/sol/usertype_container_launch.hpp
index b07e76d8..dbf5a8cd 100644
--- a/include/sol/usertype_container_launch.hpp
+++ b/include/sol/usertype_container_launch.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/usertype_core.hpp b/include/sol/usertype_core.hpp
index d5d9c6b1..a761c354 100644
--- a/include/sol/usertype_core.hpp
+++ b/include/sol/usertype_core.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/usertype_proxy.hpp b/include/sol/usertype_proxy.hpp
index e4789a17..766c988f 100644
--- a/include/sol/usertype_proxy.hpp
+++ b/include/sol/usertype_proxy.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/usertype_storage.hpp b/include/sol/usertype_storage.hpp
index 3c4c54cb..1891d1dd 100644
--- a/include/sol/usertype_storage.hpp
+++ b/include/sol/usertype_storage.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/usertype_traits.hpp b/include/sol/usertype_traits.hpp
index 0303b2d6..c3fa33f4 100644
--- a/include/sol/usertype_traits.hpp
+++ b/include/sol/usertype_traits.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/variadic_args.hpp b/include/sol/variadic_args.hpp
index a10c549e..f01c2ed5 100644
--- a/include/sol/variadic_args.hpp
+++ b/include/sol/variadic_args.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/variadic_results.hpp b/include/sol/variadic_results.hpp
index 87e4cb4b..5d278fc4 100644
--- a/include/sol/variadic_results.hpp
+++ b/include/sol/variadic_results.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/include/sol/version.hpp b/include/sol/version.hpp
index 252d08f7..92ffbbc4 100644
--- a/include/sol/version.hpp
+++ b/include/sol/version.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -691,6 +691,28 @@
 	#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
 #endif
 
+#if defined(SOL2_CI)
+	#if (SOL2_CI != 0)
+		#define SOL2_CI_I_ SOL_ON
+	#else
+		#define SOL2_CI_I_ SOL_OFF
+	#endif
+#else
+	#define SOL2_CI_I_ SOL_OFF
+#endif
+
+#if defined(SOL_C_ASSERT)
+	#define SOL_USER_C_ASSERT_I_ SOL_ON
+#else
+	#define SOL_USER_C_ASSERT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_M_ASSERT)
+	#define SOL_USER_M_ASSERT_I_ SOL_ON
+#else
+	#define SOL_USER_M_ASSERT_I_ SOL_DEFAULT_OFF
+#endif
+
 // clang-format on
 
 #endif // SOL_VERSION_HPP
diff --git a/include/sol/wrapper.hpp b/include/sol/wrapper.hpp
index cf250680..1735fe93 100644
--- a/include/sol/wrapper.hpp
+++ b/include/sol/wrapper.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/scripts/build.linux.sh b/scripts/build.linux.sh
index 1cba59d6..ddbd9b8f 100644
--- a/scripts/build.linux.sh
+++ b/scripts/build.linux.sh
@@ -3,7 +3,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/scripts/preparation.linux.sh b/scripts/preparation.linux.sh
index b08a2c98..c3530287 100644
--- a/scripts/preparation.linux.sh
+++ b/scripts/preparation.linux.sh
@@ -3,7 +3,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/scripts/preparation.osx.sh b/scripts/preparation.osx.sh
index 998e3805..2473e039 100644
--- a/scripts/preparation.osx.sh
+++ b/scripts/preparation.osx.sh
@@ -3,7 +3,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/scripts/push.linux.sh b/scripts/push.linux.sh
index d5141060..7ff07ebc 100644
--- a/scripts/push.linux.sh
+++ b/scripts/push.linux.sh
@@ -3,7 +3,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/scripts/run.linux.sh b/scripts/run.linux.sh
index 0265851d..a268491d 100644
--- a/scripts/run.linux.sh
+++ b/scripts/run.linux.sh
@@ -3,7 +3,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/scripts/run.osx.sh b/scripts/run.osx.sh
index c0257d3d..28e8ed6b 100644
--- a/scripts/run.osx.sh
+++ b/scripts/run.osx.sh
@@ -3,7 +3,7 @@
 # # # # sol3
 # The MIT License (MIT)
 #
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/single/include/sol/config.hpp b/single/include/sol/config.hpp
index 4ce46b4d..fe791694 100644
--- a/single/include/sol/config.hpp
+++ b/single/include/sol/config.hpp
@@ -20,8 +20,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2021-02-14 05:45:03.730363 UTC
-// This header was generated with sol v3.2.3 (revision 37d891fa)
+// Generated 2021-03-06 04:31:49.108515 UTC
+// This header was generated with sol v3.2.3 (revision d4b13ff8)
 // https://github.com/ThePhD/sol2
 
 #ifndef SOL_SINGLE_CONFIG_HPP
diff --git a/single/include/sol/forward.hpp b/single/include/sol/forward.hpp
index 1f8a2166..d1359c1e 100644
--- a/single/include/sol/forward.hpp
+++ b/single/include/sol/forward.hpp
@@ -20,8 +20,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2021-02-14 05:45:03.725363 UTC
-// This header was generated with sol v3.2.3 (revision 37d891fa)
+// Generated 2021-03-06 04:31:49.090519 UTC
+// This header was generated with sol v3.2.3 (revision d4b13ff8)
 // https://github.com/ThePhD/sol2
 
 #ifndef SOL_SINGLE_INCLUDE_FORWARD_HPP
@@ -697,6 +697,28 @@
 	#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
 #endif
 
+#if defined(SOL2_CI)
+	#if (SOL2_CI != 0)
+		#define SOL2_CI_I_ SOL_ON
+	#else
+		#define SOL2_CI_I_ SOL_OFF
+	#endif
+#else
+	#define SOL2_CI_I_ SOL_OFF
+#endif
+
+#if defined(SOL_C_ASSERT)
+	#define SOL_USER_C_ASSERT_I_ SOL_ON
+#else
+	#define SOL_USER_C_ASSERT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_M_ASSERT)
+	#define SOL_USER_M_ASSERT_I_ SOL_ON
+#else
+	#define SOL_USER_M_ASSERT_I_ SOL_DEFAULT_OFF
+#endif
+
 // end of sol/version.hpp
 
 #include <utility>
diff --git a/single/include/sol/sol.hpp b/single/include/sol/sol.hpp
index 3e7feaea..3ffc5643 100644
--- a/single/include/sol/sol.hpp
+++ b/single/include/sol/sol.hpp
@@ -20,8 +20,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2021-02-14 05:45:03.271116 UTC
-// This header was generated with sol v3.2.3 (revision 37d891fa)
+// Generated 2021-03-06 04:31:48.560338 UTC
+// This header was generated with sol v3.2.3 (revision d4b13ff8)
 // https://github.com/ThePhD/sol2
 
 #ifndef SOL_SINGLE_INCLUDE_HPP
@@ -697,6 +697,28 @@
 	#define SOL_BOOST_NONE_CONSTEXPR_I_ constexpr
 #endif
 
+#if defined(SOL2_CI)
+	#if (SOL2_CI != 0)
+		#define SOL2_CI_I_ SOL_ON
+	#else
+		#define SOL2_CI_I_ SOL_OFF
+	#endif
+#else
+	#define SOL2_CI_I_ SOL_OFF
+#endif
+
+#if defined(SOL_C_ASSERT)
+	#define SOL_USER_C_ASSERT_I_ SOL_ON
+#else
+	#define SOL_USER_C_ASSERT_I_ SOL_DEFAULT_OFF
+#endif
+
+#if defined(SOL_M_ASSERT)
+	#define SOL_USER_M_ASSERT_I_ SOL_ON
+#else
+	#define SOL_USER_M_ASSERT_I_ SOL_DEFAULT_OFF
+#endif
+
 // end of sol/version.hpp
 
 #if SOL_IS_ON(SOL_INSIDE_UNREAL_ENGINE_I_)
@@ -2465,6 +2487,73 @@ namespace sol {
 #endif // SOL_FORWARD_DETAIL_HPP
 // end of sol/forward_detail.hpp
 
+// beginning of sol/assert.hpp
+
+#if SOL_IS_ON(SOL2_CI_I_)
+
+struct pre_main {
+	pre_main() {
+#ifdef _MSC_VER
+		_set_abort_behavior(0, _WRITE_ABORT_MSG);
+#endif
+	}
+} pm;
+
+#endif // Prevent lockup when doing Continuous Integration
+
+#if SOL_IS_ON(SOL_USER_C_ASSERT_I_)
+	#define sol_c_assert(...) SOL_C_ASSERT(__VA_ARGS__)
+#else
+	#if SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#include <exception>
+		#include <iostream>
+		#include <cstdlib>
+
+			#define sol_c_assert(...)                                                                                               \
+				do {                                                                                                               \
+					if (!(__VA_ARGS__)) {                                                                                           \
+						std::cerr << "Assertion `" #__VA_ARGS__ "` failed in " << __FILE__ << " line " << __LINE__ << std::endl; \
+						std::terminate();                                                                                        \
+					}                                                                                                             \
+				} while (false)
+	#else
+		#define sol_c_assert(...)           \
+			do {                           \
+				if (false) {              \
+					(void)(__VA_ARGS__); \
+				}                         \
+			} while (false)
+	#endif
+#endif
+
+#if SOL_IS_ON(SOL_USER_M_ASSERT_I_)
+	#define sol_m_assert(message, ...) SOL_M_ASSERT(message, __VA_ARGS__)
+#else
+	#if SOL_IS_ON(SOL_DEBUG_BUILD_I_)
+		#include <exception>
+		#include <iostream>
+		#include <cstdlib>
+
+		#define sol_m_assert(message, ...)                                                                                                         \
+			do {                                                                                                                                  \
+				if (!(__VA_ARGS__)) {                                                                                                              \
+					std::cerr << "Assertion `" #__VA_ARGS__ "` failed in " << __FILE__ << " line " << __LINE__ << ": " << message << std::endl; \
+					std::terminate();                                                                                                           \
+				}                                                                                                                                \
+			} while (false)
+	#else
+		#define sol_m_assert(message, ...)    \
+			do {                             \
+				if (false) {                \
+					(void)(__VA_ARGS__);   \
+					(void)sizeof(message); \
+				}                           \
+			} while (false)
+	#endif
+#endif
+
+// end of sol/assert.hpp
+
 // beginning of sol/bytecode.hpp
 
 // beginning of sol/compatibility.hpp
@@ -6662,8 +6751,9 @@ namespace sol { namespace detail {
 			return *this;
 		};
 		template <typename Arg, typename... Args,
-			typename = std::enable_if_t<!std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
-			                                 ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
+			typename = std::enable_if_t<
+			     !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
+			          ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
 		ebco(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<T, Arg, Args...>)
 		: m_value(std::forward<Arg>(arg), std::forward<Args>(args)...) {
 		}
@@ -6689,8 +6779,9 @@ namespace sol { namespace detail {
 		ebco(const T& v) noexcept(std::is_nothrow_copy_constructible_v<T>) : T(v) {};
 		ebco(T&& v) noexcept(std::is_nothrow_move_constructible_v<T>) : T(std::move(v)) {};
 		template <typename Arg, typename... Args,
-			typename = std::enable_if_t<!std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
-			                                 ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
+			typename = std::enable_if_t<
+			     !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>,
+			          ebco> && !std::is_same_v<std::remove_reference_t<std::remove_cv_t<Arg>>, T> && (sizeof...(Args) > 0 || !std::is_convertible_v<Arg, T>)>>
 		ebco(Arg&& arg, Args&&... args) noexcept(std::is_nothrow_constructible_v<T, Arg, Args...>) : T(std::forward<Arg>(arg), std::forward<Args>(args)...) {
 		}
 
@@ -8739,7 +8830,8 @@ namespace sol {
 		template <typename T>
 		constexpr bool unique_is_null_noexcept() noexcept {
 			if constexpr (meta::meta_detail::unique_usertype_is_null_with_state_v<std::remove_cv_t<T>>) {
-				return noexcept(unique_usertype_traits<T>::is_null(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+				return noexcept(
+				     unique_usertype_traits<T>::is_null(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
 			}
 			else {
 				return noexcept(unique_usertype_traits<T>::is_null(std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
@@ -8760,7 +8852,8 @@ namespace sol {
 		template <typename T>
 		constexpr bool unique_get_noexcept() noexcept {
 			if constexpr (meta::meta_detail::unique_usertype_get_with_state_v<std::remove_cv_t<T>>) {
-				return noexcept(unique_usertype_traits<T>::get(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
+				return noexcept(
+				     unique_usertype_traits<T>::get(static_cast<lua_State*>(nullptr), std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
 			}
 			else {
 				return noexcept(unique_usertype_traits<T>::get(std::declval<unique_usertype_actual_t<std::remove_cv_t<T>>>()));
@@ -12662,8 +12755,10 @@ namespace sol {
 			}
 
 			static constexpr int sequence_length(unsigned char b) {
-				return (b & start_2byte_mask) == 0 ? 1
-				                                   : (b & start_3byte_mask) != start_3byte_mask ? 2 : (b & start_4byte_mask) != start_4byte_mask ? 3 : 4;
+				return (b & start_2byte_mask) == 0                ? 1
+				     : (b & start_3byte_mask) != start_3byte_mask ? 2
+				     : (b & start_4byte_mask) != start_4byte_mask ? 3
+				                                                  : 4;
 			}
 
 			static constexpr char32_t decode(unsigned char b0, unsigned char b1) {
@@ -15962,7 +16057,8 @@ namespace sol {
 			}
 
 			template <bool checked, typename Arg, typename... Args, std::size_t I, std::size_t... Is, typename Handler, typename Fx, typename... FxArgs>
-			static decltype(auto) eval(types<Arg, Args...>, std::index_sequence<I, Is...>, lua_State* L_, int start_index_, Handler&& handler_, record& tracking_, Fx&& fx_, FxArgs&&... fxargs_) {
+			static decltype(auto) eval(types<Arg, Args...>, std::index_sequence<I, Is...>, lua_State* L_, int start_index_, Handler&& handler_,
+			     record& tracking_, Fx&& fx_, FxArgs&&... fxargs_) {
 #if SOL_IS_ON(SOL_PROPAGATE_EXCEPTIONS_I_)
 				// We can save performance/time by letting errors unwind produced arguments
 				// rather than checking everything once, and then potentially re-doing work
@@ -15993,7 +16089,8 @@ namespace sol {
 			}
 
 			template <bool checkargs = detail::default_safe_function_calls, std::size_t... I, typename R, typename... Args, typename Fx, typename... FxArgs>
-			inline decltype(auto) call(types<R>, types<Args...> argument_types_, std::index_sequence<I...> argument_indices_, lua_State* L_, int start_index_, Fx&& fx_, FxArgs&&... args_) {
+			inline decltype(auto) call(types<R>, types<Args...> argument_types_, std::index_sequence<I...> argument_indices_, lua_State* L_,
+			     int start_index_, Fx&& fx_, FxArgs&&... args_) {
 				static_assert(meta::all_v<meta::is_not_move_only<Args>...>,
 				     "One of the arguments being bound is a move-only type, and it is not being taken by reference: this will break your code. Please take "
 				     "a reference and std::move it manually if this was your intention.");
@@ -16005,10 +16102,12 @@ namespace sol {
 				}
 #endif
 				if constexpr (std::is_void_v<R>) {
-					eval<checkargs>(argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
+					eval<checkargs>(
+					     argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
 				}
 				else {
-					return eval<checkargs>(argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
+					return eval<checkargs>(
+					     argument_types_, argument_indices_, L_, start_index_, handler, tracking, std::forward<Fx>(fx_), std::forward<FxArgs>(args_)...);
 				}
 			}
 		} // namespace stack_detail
@@ -19098,7 +19197,7 @@ namespace sol {
 
 	namespace detail {
 		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
-		inline constexpr auto resolve_i(types<R(Args...)>, F &&) -> R (meta::unqualified_t<F>::*)(Args...) {
+		inline constexpr auto resolve_i(types<R(Args...)>, F&&) -> R (meta::unqualified_t<F>::*)(Args...) {
 			using Sig = R(Args...);
 			typedef meta::unqualified_t<F> Fu;
 			return static_cast<Sig Fu::*>(&Fu::operator());
@@ -19167,7 +19266,7 @@ namespace sol {
 
 	namespace detail {
 		template <typename R, typename... Args, typename F, typename = std::invoke_result_t<meta::unqualified_t<F>, Args...>>
-		inline auto resolve_i(types<R(Args...)>, F &&) -> R (meta::unqualified_t<F>::*)(Args...) {
+		inline auto resolve_i(types<R(Args...)>, F&&) -> R (meta::unqualified_t<F>::*)(Args...) {
 			using Sig = R(Args...);
 			typedef meta::unqualified_t<F> Fu;
 			return static_cast<Sig Fu::*>(&Fu::operator());
@@ -26055,11 +26154,11 @@ namespace sol {
 			return static_cast<bool>(env);
 		}
 
-		operator optional<environment> &() {
+		operator optional<environment>&() {
 			return env;
 		}
 
-		operator const optional<environment> &() const {
+		operator const optional<environment>&() const {
 			return env;
 		}
 
diff --git a/sol2.natvis b/sol2.natvis
index 37d72164..9309a130 100644
--- a/sol2.natvis
+++ b/sol2.natvis
@@ -22,17 +22,17 @@
 		</Expand>
 	</Type>
 	<Type Name="sol::basic_coroutine&lt;*&gt;">
-		<DisplayString>ref={this->ref} status={stats} error_handler={error_handler}</DisplayString>
+		<DisplayString>ref={this->ref} status={stats} error handler={m_error_handler}</DisplayString>
 		<Expand>
 			<Item Name="status">stats</Item>
-			<Item Name="error_handler">error_handler</Item>
+			<Item Name="error handler">m_error_handler</Item>
 			<Item Name="reference">*($T1*)this</Item>
 		</Expand>
 	</Type>
 	<Type Name="sol::basic_protected_function&lt;*&gt;">
-		<DisplayString>status={stats} error_handler={error_handler} index={index} state={luastate}</DisplayString>
+		<DisplayString>status={stats} error handler={m_error_handler} index={index} state={luastate}</DisplayString>
 		<Expand>
-			<Item Name="error_handler">error_handler</Item>
+			<Item Name="error handler">m_error_handler</Item>
 			<Item Name="reference">*($T1*)this</Item>
 		</Expand>
 	</Type>
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4aea3ccf..096bd9a1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -22,6 +22,14 @@
 
 # # # # sol3 tests
 
+# # Dependencies
+FetchContent_Declare(
+	Catch2
+	GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+	GIT_TAG        v2.13.4
+)
+FetchContent_MakeAvailable(Catch2)
+
 add_subdirectory(header_tests)
 add_subdirectory(runtime_tests)
 add_subdirectory(config_tests)
diff --git a/tests/config_tests/CMakeLists.txt b/tests/config_tests/CMakeLists.txt
index 46760e30..281213a5 100644
--- a/tests/config_tests/CMakeLists.txt
+++ b/tests/config_tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/config_tests/function_pointers/CMakeLists.txt b/tests/config_tests/function_pointers/CMakeLists.txt
index 7e0afa17..d3f1ca9e 100644
--- a/tests/config_tests/function_pointers/CMakeLists.txt
+++ b/tests/config_tests/function_pointers/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -32,7 +32,7 @@ function(CREATE_TEST test_target_name test_name target_sol)
 		OUTPUT_NAME ${test_name}
 		EXPORT_NAME sol2::${test_name})
 	target_link_libraries(${test_target_name} 
-		PUBLIC Threads::Threads ${LUA_LIBRARIES} ${target_sol})
+		PUBLIC Threads::Threads ${LUA_LIBRARIES} ${target_sol} ${CMAKE_DL_LIBS})
 	target_compile_definitions(${test_target_name}
 		PRIVATE SOL_GET_FUNCTION_POINTER_UNSAFE=1 SOL_ALL_SAFETIES_ON=1)
 	target_include_directories(${test_target_name}
@@ -82,11 +82,6 @@ function(CREATE_TEST test_target_name test_name target_sol)
 		target_compile_definitions(${test_target_name} 
 			PRIVATE SOL2_CI)
 	endif()
-
-	if (CMAKE_DL_LIBS)
-		target_link_libraries(${test_target_name}
-			PRIVATE ${CMAKE_DL_LIBS})
-	endif()
 	
 	add_test(NAME ${test_name} COMMAND ${test_target_name})
 	if(SOL2_ENABLE_INSTALL)
@@ -98,8 +93,8 @@ if (SOL2_TESTS)
 	CREATE_TEST(config_function_pointers_tests "config_function_pointers_tests" sol2::sol2)
 endif()
 if (SOL2_TESTS_SINGLE)
-	CREATE_TEST(config_function_pointers_tests_single "config_function_pointers_tests.single" sol2::sol2_single)
+	CREATE_TEST(config_function_pointers_tests_single "config_function_pointers_tests.single" sol2::sol2::single)
 endif()
 if (SOL2_TESTS_SINGLE_GENERATED)
-	CREATE_TEST(config_function_pointers_tests_generated_single "config_function_pointers_tests.single.generated" sol2::sol2_single_generated)
+	CREATE_TEST(config_function_pointers_tests_generated_single "config_function_pointers_tests.single.generated" sol2::sol2::single_generated)
 endif()
diff --git a/tests/config_tests/function_pointers/source/main.cpp b/tests/config_tests/function_pointers/source/main.cpp
index a2d3c0d5..d943cb38 100644
--- a/tests/config_tests/function_pointers/source/main.cpp
+++ b/tests/config_tests/function_pointers/source/main.cpp
@@ -1,6 +1,5 @@
 #include <sol/sol.hpp>
 
-#include <assert.hpp>
 
 #include <iostream>
 
@@ -50,11 +49,11 @@ int main() {
 	int free_function_f_result = free_function_f(magic_value);
 	int callback_f_result = callback_f(&free_function);
 	int lua_callback_f_result = lua_callback_f(&free_function);
-	c_assert(lambda_f_result == expected_value);
-	c_assert(lambda_ptr_f_result == expected_value);
-	c_assert(free_function_f_result == expected_free_function_value);
-	c_assert(callback_f_result == expected_callback_value);
-	c_assert(lua_callback_f_result == expected_callback_value);
+	sol_c_assert(lambda_f_result == expected_value);
+	sol_c_assert(lambda_ptr_f_result == expected_value);
+	sol_c_assert(free_function_f_result == expected_free_function_value);
+	sol_c_assert(callback_f_result == expected_callback_value);
+	sol_c_assert(lua_callback_f_result == expected_callback_value);
 
 	const char code[] = R"(
 assert(lambda() == expected_value)
@@ -68,7 +67,7 @@ assert(callback(free_function) == expected_callback_value)
 		std::cerr << err.value().what() << std::endl;
 		return 1;
 	}
-	c_assert(!err.has_value());
+	sol_c_assert(!err.has_value());
 
 	return 0;
 }
diff --git a/tests/header_tests/CMakeLists.txt b/tests/header_tests/CMakeLists.txt
index 3474e786..bc30a7c8 100644
--- a/tests/header_tests/CMakeLists.txt
+++ b/tests/header_tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -36,7 +36,7 @@ function(CREATE_TEST test_target_name test_name target_sol)
 		OUTPUT_NAME ${test_name}
 		EXPORT_NAME sol2::${test_name})
 	target_link_libraries(${test_target_name} 
-		PUBLIC Threads::Threads ${LUA_LIBRARIES} ${CATCH_LIBRARIES} ${target_sol})
+		PUBLIC Threads::Threads ${LUA_LIBRARIES} ${target_sol} ${CMAKE_DL_LIBS})
 	
 	if (MSVC)
 		target_compile_options(${test_target_name}
@@ -81,10 +81,6 @@ function(CREATE_TEST test_target_name test_name target_sol)
 		target_compile_definitions(${test_target_name} 
 			PRIVATE SOL2_CI)
 	endif()
-	if (CMAKE_DL_LIBS)
-		target_link_libraries(${test_target_name} PUBLIC
-			${CMAKE_DL_LIBS})
-	endif()
 	
 	add_test(NAME ${test_name} COMMAND ${test_target_name})
 	if(SOL2_ENABLE_INSTALL)
@@ -93,11 +89,11 @@ function(CREATE_TEST test_target_name test_name target_sol)
 endfunction(CREATE_TEST)
 
 if (SOL2_TESTS)
-	CREATE_TEST(compile_tests "compile_tests" sol2::sol2)
+	CREATE_TEST(compile_tests "sol2.compile_tests" sol2::sol2)
 endif()
 if (SOL2_TESTS_SINGLE)
-	CREATE_TEST(compile_tests_single "compile_tests.single" sol2::sol2_single)
+	CREATE_TEST(compile_tests_single "sol2.compile_tests.single" sol2::sol2::single)
 endif()
 if (SOL2_TESTS_SINGLE_GENERATED)
-	CREATE_TEST(compile_tests_generated_single "compile_tests.single.generated" sol2::sol2_single_generated)
+	CREATE_TEST(compile_tests_generated_single "sol2.compile_tests.single.generated" sol2::sol2::single_generated)
 endif()
diff --git a/tests/header_tests/source/as_args.cpp b/tests/header_tests/source/as_args.cpp
index 72f38748..2c6af751 100644
--- a/tests/header_tests/source/as_args.cpp
+++ b/tests/header_tests/source/as_args.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/as_returns.cpp b/tests/header_tests/source/as_returns.cpp
index 8797ee8b..70ceda47 100644
--- a/tests/header_tests/source/as_returns.cpp
+++ b/tests/header_tests/source/as_returns.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/base_traits.cpp b/tests/header_tests/source/base_traits.cpp
index 7bf9f24b..90010f71 100644
--- a/tests/header_tests/source/base_traits.cpp
+++ b/tests/header_tests/source/base_traits.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/bind_traits.cpp b/tests/header_tests/source/bind_traits.cpp
index acc727f7..cf65d1de 100644
--- a/tests/header_tests/source/bind_traits.cpp
+++ b/tests/header_tests/source/bind_traits.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/bytecode.cpp b/tests/header_tests/source/bytecode.cpp
index 3ae45343..e06c0d92 100644
--- a/tests/header_tests/source/bytecode.cpp
+++ b/tests/header_tests/source/bytecode.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/call.cpp b/tests/header_tests/source/call.cpp
index 48c6996a..c1cbe298 100644
--- a/tests/header_tests/source/call.cpp
+++ b/tests/header_tests/source/call.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/compatibility.cpp b/tests/header_tests/source/compatibility.cpp
index d0fabbeb..f0d0fd87 100644
--- a/tests/header_tests/source/compatibility.cpp
+++ b/tests/header_tests/source/compatibility.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/compatibility/compat-5.3.cpp b/tests/header_tests/source/compatibility/compat-5.3.cpp
index 8924dd17..d6d51ea1 100644
--- a/tests/header_tests/source/compatibility/compat-5.3.cpp
+++ b/tests/header_tests/source/compatibility/compat-5.3.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/compatibility/lua_version.cpp b/tests/header_tests/source/compatibility/lua_version.cpp
index 44849905..a9c912b6 100644
--- a/tests/header_tests/source/compatibility/lua_version.cpp
+++ b/tests/header_tests/source/compatibility/lua_version.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/config.cpp b/tests/header_tests/source/config.cpp
index 72e7398f..c013eb4a 100644
--- a/tests/header_tests/source/config.cpp
+++ b/tests/header_tests/source/config.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/coroutine.cpp b/tests/header_tests/source/coroutine.cpp
index fb95ef87..da70335d 100644
--- a/tests/header_tests/source/coroutine.cpp
+++ b/tests/header_tests/source/coroutine.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/debug.cpp b/tests/header_tests/source/debug.cpp
index bd6b6129..917f29b3 100644
--- a/tests/header_tests/source/debug.cpp
+++ b/tests/header_tests/source/debug.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/demangle.cpp b/tests/header_tests/source/demangle.cpp
index 0fbfd186..aa9f74a1 100644
--- a/tests/header_tests/source/demangle.cpp
+++ b/tests/header_tests/source/demangle.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/deprecate.cpp b/tests/header_tests/source/deprecate.cpp
index d5c6e0fc..0bc43e82 100644
--- a/tests/header_tests/source/deprecate.cpp
+++ b/tests/header_tests/source/deprecate.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/ebco.cpp b/tests/header_tests/source/ebco.cpp
index 24e76f5a..099448e8 100644
--- a/tests/header_tests/source/ebco.cpp
+++ b/tests/header_tests/source/ebco.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/environment.cpp b/tests/header_tests/source/environment.cpp
index 01397865..33a1176d 100644
--- a/tests/header_tests/source/environment.cpp
+++ b/tests/header_tests/source/environment.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/error_handler.cpp b/tests/header_tests/source/error_handler.cpp
index 2813dffe..192e5b8f 100644
--- a/tests/header_tests/source/error_handler.cpp
+++ b/tests/header_tests/source/error_handler.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/forward.cpp b/tests/header_tests/source/forward.cpp
index cfb8b0e4..9a5a0705 100644
--- a/tests/header_tests/source/forward.cpp
+++ b/tests/header_tests/source/forward.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/forward_detail.cpp b/tests/header_tests/source/forward_detail.cpp
index ddacbcaf..d20ed791 100644
--- a/tests/header_tests/source/forward_detail.cpp
+++ b/tests/header_tests/source/forward_detail.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/function.cpp b/tests/header_tests/source/function.cpp
index b186be95..856542bc 100644
--- a/tests/header_tests/source/function.cpp
+++ b/tests/header_tests/source/function.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/function_result.cpp b/tests/header_tests/source/function_result.cpp
index cab89b14..7b7d9780 100644
--- a/tests/header_tests/source/function_result.cpp
+++ b/tests/header_tests/source/function_result.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/function_types.cpp b/tests/header_tests/source/function_types.cpp
index ac1be56f..8d673a89 100644
--- a/tests/header_tests/source/function_types.cpp
+++ b/tests/header_tests/source/function_types.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/function_types_core.cpp b/tests/header_tests/source/function_types_core.cpp
index b4796f30..ee3c0fc7 100644
--- a/tests/header_tests/source/function_types_core.cpp
+++ b/tests/header_tests/source/function_types_core.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/function_types_overloaded.cpp b/tests/header_tests/source/function_types_overloaded.cpp
index 23ddde13..88561714 100644
--- a/tests/header_tests/source/function_types_overloaded.cpp
+++ b/tests/header_tests/source/function_types_overloaded.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/function_types_stateful.cpp b/tests/header_tests/source/function_types_stateful.cpp
index 6811eddc..23d01eb7 100644
--- a/tests/header_tests/source/function_types_stateful.cpp
+++ b/tests/header_tests/source/function_types_stateful.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/function_types_stateless.cpp b/tests/header_tests/source/function_types_stateless.cpp
index 56d65b85..31172f24 100644
--- a/tests/header_tests/source/function_types_stateless.cpp
+++ b/tests/header_tests/source/function_types_stateless.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/function_types_templated.cpp b/tests/header_tests/source/function_types_templated.cpp
index 6801a385..b939dcab 100644
--- a/tests/header_tests/source/function_types_templated.cpp
+++ b/tests/header_tests/source/function_types_templated.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/in_place.cpp b/tests/header_tests/source/in_place.cpp
index 92ce1afc..2b38c6ec 100644
--- a/tests/header_tests/source/in_place.cpp
+++ b/tests/header_tests/source/in_place.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/inheritance.cpp b/tests/header_tests/source/inheritance.cpp
index 83a536ca..999563b5 100644
--- a/tests/header_tests/source/inheritance.cpp
+++ b/tests/header_tests/source/inheritance.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/load_result.cpp b/tests/header_tests/source/load_result.cpp
index 49e3e852..82dce26f 100644
--- a/tests/header_tests/source/load_result.cpp
+++ b/tests/header_tests/source/load_result.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/lua_table.cpp b/tests/header_tests/source/lua_table.cpp
index b188049b..254edf66 100644
--- a/tests/header_tests/source/lua_table.cpp
+++ b/tests/header_tests/source/lua_table.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/lua_value.cpp b/tests/header_tests/source/lua_value.cpp
index c0f1e5fa..f599be4e 100644
--- a/tests/header_tests/source/lua_value.cpp
+++ b/tests/header_tests/source/lua_value.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/main.cpp b/tests/header_tests/source/main.cpp
index 4a9efee5..c472b345 100644
--- a/tests/header_tests/source/main.cpp
+++ b/tests/header_tests/source/main.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -25,6 +25,6 @@
 
 #include <sol/sol.hpp>
 
-int main () {
+int main() {
 	return 0;
 }
\ No newline at end of file
diff --git a/tests/header_tests/source/make_reference.cpp b/tests/header_tests/source/make_reference.cpp
index 402700c5..c95ba293 100644
--- a/tests/header_tests/source/make_reference.cpp
+++ b/tests/header_tests/source/make_reference.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/metatable.cpp b/tests/header_tests/source/metatable.cpp
index 019f6044..ed5fd7a5 100644
--- a/tests/header_tests/source/metatable.cpp
+++ b/tests/header_tests/source/metatable.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/object.cpp b/tests/header_tests/source/object.cpp
index 1e8b7158..6ad10610 100644
--- a/tests/header_tests/source/object.cpp
+++ b/tests/header_tests/source/object.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/object_base.cpp b/tests/header_tests/source/object_base.cpp
index edcdb6f0..be2bf4e1 100644
--- a/tests/header_tests/source/object_base.cpp
+++ b/tests/header_tests/source/object_base.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/optional.cpp b/tests/header_tests/source/optional.cpp
index a21da40e..3c942b76 100644
--- a/tests/header_tests/source/optional.cpp
+++ b/tests/header_tests/source/optional.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/optional_implementation.cpp b/tests/header_tests/source/optional_implementation.cpp
index fbae3c9d..6e7399fb 100644
--- a/tests/header_tests/source/optional_implementation.cpp
+++ b/tests/header_tests/source/optional_implementation.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/overload.cpp b/tests/header_tests/source/overload.cpp
index 5cba0526..22370153 100644
--- a/tests/header_tests/source/overload.cpp
+++ b/tests/header_tests/source/overload.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/packaged_coroutine.cpp b/tests/header_tests/source/packaged_coroutine.cpp
index 793b32dd..04aac938 100644
--- a/tests/header_tests/source/packaged_coroutine.cpp
+++ b/tests/header_tests/source/packaged_coroutine.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/pairs_iterator.cpp b/tests/header_tests/source/pairs_iterator.cpp
index 1b6e73e0..be3a3104 100644
--- a/tests/header_tests/source/pairs_iterator.cpp
+++ b/tests/header_tests/source/pairs_iterator.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/pointer_like.cpp b/tests/header_tests/source/pointer_like.cpp
index 457b739f..002d3c29 100644
--- a/tests/header_tests/source/pointer_like.cpp
+++ b/tests/header_tests/source/pointer_like.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/policies.cpp b/tests/header_tests/source/policies.cpp
index a51aed35..999fdf05 100644
--- a/tests/header_tests/source/policies.cpp
+++ b/tests/header_tests/source/policies.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/property.cpp b/tests/header_tests/source/property.cpp
index b3cb4b54..7adc9e20 100644
--- a/tests/header_tests/source/property.cpp
+++ b/tests/header_tests/source/property.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/protect.cpp b/tests/header_tests/source/protect.cpp
index 02b91f41..7808a888 100644
--- a/tests/header_tests/source/protect.cpp
+++ b/tests/header_tests/source/protect.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/protected_function.cpp b/tests/header_tests/source/protected_function.cpp
index 2bfd0700..b5b6b922 100644
--- a/tests/header_tests/source/protected_function.cpp
+++ b/tests/header_tests/source/protected_function.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/protected_function_result.cpp b/tests/header_tests/source/protected_function_result.cpp
index b99267a6..b94d55ae 100644
--- a/tests/header_tests/source/protected_function_result.cpp
+++ b/tests/header_tests/source/protected_function_result.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/protected_handler.cpp b/tests/header_tests/source/protected_handler.cpp
index d171fbcc..c4ec567d 100644
--- a/tests/header_tests/source/protected_handler.cpp
+++ b/tests/header_tests/source/protected_handler.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/proxy.cpp b/tests/header_tests/source/proxy.cpp
index 2cc0efa9..17a7b0f0 100644
--- a/tests/header_tests/source/proxy.cpp
+++ b/tests/header_tests/source/proxy.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/proxy_base.cpp b/tests/header_tests/source/proxy_base.cpp
index f8489c9c..9208e6f7 100644
--- a/tests/header_tests/source/proxy_base.cpp
+++ b/tests/header_tests/source/proxy_base.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/raii.cpp b/tests/header_tests/source/raii.cpp
index bac0c01b..4b95cbea 100644
--- a/tests/header_tests/source/raii.cpp
+++ b/tests/header_tests/source/raii.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/reference.cpp b/tests/header_tests/source/reference.cpp
index 91f7bd47..93b43d8b 100644
--- a/tests/header_tests/source/reference.cpp
+++ b/tests/header_tests/source/reference.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/resolve.cpp b/tests/header_tests/source/resolve.cpp
index 85fd7f00..744035d2 100644
--- a/tests/header_tests/source/resolve.cpp
+++ b/tests/header_tests/source/resolve.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/sol.cpp b/tests/header_tests/source/sol.cpp
index 73fdb5a9..7f8e4e38 100644
--- a/tests/header_tests/source/sol.cpp
+++ b/tests/header_tests/source/sol.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/sol_defines.hpp b/tests/header_tests/source/sol_defines.hpp
index 64d4d550..aed5758e 100644
--- a/tests/header_tests/source/sol_defines.hpp
+++ b/tests/header_tests/source/sol_defines.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack.cpp b/tests/header_tests/source/stack.cpp
index dba4ec4f..1a4660b9 100644
--- a/tests/header_tests/source/stack.cpp
+++ b/tests/header_tests/source/stack.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_check.cpp b/tests/header_tests/source/stack_check.cpp
index aeb748a5..799d1897 100644
--- a/tests/header_tests/source/stack_check.cpp
+++ b/tests/header_tests/source/stack_check.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_check_get.cpp b/tests/header_tests/source/stack_check_get.cpp
index e7e962bb..a5925ab5 100644
--- a/tests/header_tests/source/stack_check_get.cpp
+++ b/tests/header_tests/source/stack_check_get.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_check_get_qualified.cpp b/tests/header_tests/source/stack_check_get_qualified.cpp
index c37412e5..cfd5d1bb 100644
--- a/tests/header_tests/source/stack_check_get_qualified.cpp
+++ b/tests/header_tests/source/stack_check_get_qualified.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_check_get_unqualified.cpp b/tests/header_tests/source/stack_check_get_unqualified.cpp
index bc9571cc..8b7f8d91 100644
--- a/tests/header_tests/source/stack_check_get_unqualified.cpp
+++ b/tests/header_tests/source/stack_check_get_unqualified.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_check_qualified.cpp b/tests/header_tests/source/stack_check_qualified.cpp
index 6c8625fc..279ee580 100644
--- a/tests/header_tests/source/stack_check_qualified.cpp
+++ b/tests/header_tests/source/stack_check_qualified.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_check_unqualified.cpp b/tests/header_tests/source/stack_check_unqualified.cpp
index fc6e862e..61a2c842 100644
--- a/tests/header_tests/source/stack_check_unqualified.cpp
+++ b/tests/header_tests/source/stack_check_unqualified.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_core.cpp b/tests/header_tests/source/stack_core.cpp
index 322b6ab6..4521abb5 100644
--- a/tests/header_tests/source/stack_core.cpp
+++ b/tests/header_tests/source/stack_core.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_field.cpp b/tests/header_tests/source/stack_field.cpp
index 0a42e1d2..723faf62 100644
--- a/tests/header_tests/source/stack_field.cpp
+++ b/tests/header_tests/source/stack_field.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_get.cpp b/tests/header_tests/source/stack_get.cpp
index dd955586..17702847 100644
--- a/tests/header_tests/source/stack_get.cpp
+++ b/tests/header_tests/source/stack_get.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_get_qualified.cpp b/tests/header_tests/source/stack_get_qualified.cpp
index 429e9b1c..4b2425fc 100644
--- a/tests/header_tests/source/stack_get_qualified.cpp
+++ b/tests/header_tests/source/stack_get_qualified.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_get_unqualified.cpp b/tests/header_tests/source/stack_get_unqualified.cpp
index 5713cff0..fbccba7e 100644
--- a/tests/header_tests/source/stack_get_unqualified.cpp
+++ b/tests/header_tests/source/stack_get_unqualified.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_guard.cpp b/tests/header_tests/source/stack_guard.cpp
index 4ec74060..211606fb 100644
--- a/tests/header_tests/source/stack_guard.cpp
+++ b/tests/header_tests/source/stack_guard.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_iterator.cpp b/tests/header_tests/source/stack_iterator.cpp
index 4c2ca182..48427c50 100644
--- a/tests/header_tests/source/stack_iterator.cpp
+++ b/tests/header_tests/source/stack_iterator.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_pop.cpp b/tests/header_tests/source/stack_pop.cpp
index 70d1db81..64ada86e 100644
--- a/tests/header_tests/source/stack_pop.cpp
+++ b/tests/header_tests/source/stack_pop.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_probe.cpp b/tests/header_tests/source/stack_probe.cpp
index 80df6c0b..207f71ab 100644
--- a/tests/header_tests/source/stack_probe.cpp
+++ b/tests/header_tests/source/stack_probe.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_proxy.cpp b/tests/header_tests/source/stack_proxy.cpp
index 3e6a6000..b9796c4c 100644
--- a/tests/header_tests/source/stack_proxy.cpp
+++ b/tests/header_tests/source/stack_proxy.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_proxy_base.cpp b/tests/header_tests/source/stack_proxy_base.cpp
index 32b74fe9..d5a7de81 100644
--- a/tests/header_tests/source/stack_proxy_base.cpp
+++ b/tests/header_tests/source/stack_proxy_base.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_push.cpp b/tests/header_tests/source/stack_push.cpp
index 7fef63b4..133d4d7f 100644
--- a/tests/header_tests/source/stack_push.cpp
+++ b/tests/header_tests/source/stack_push.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/stack_reference.cpp b/tests/header_tests/source/stack_reference.cpp
index 32b0f4a7..55370695 100644
--- a/tests/header_tests/source/stack_reference.cpp
+++ b/tests/header_tests/source/stack_reference.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/state_handling.cpp b/tests/header_tests/source/state_handling.cpp
index b275961e..8f2b0451 100644
--- a/tests/header_tests/source/state_handling.cpp
+++ b/tests/header_tests/source/state_handling.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/string_view.cpp b/tests/header_tests/source/string_view.cpp
index d892f202..be10bd9c 100644
--- a/tests/header_tests/source/string_view.cpp
+++ b/tests/header_tests/source/string_view.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/table.cpp b/tests/header_tests/source/table.cpp
index 294fbb50..290acb5a 100644
--- a/tests/header_tests/source/table.cpp
+++ b/tests/header_tests/source/table.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/table_core.cpp b/tests/header_tests/source/table_core.cpp
index c5c6ecaa..0fb93927 100644
--- a/tests/header_tests/source/table_core.cpp
+++ b/tests/header_tests/source/table_core.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/table_iterator.cpp b/tests/header_tests/source/table_iterator.cpp
index b2dee8f6..65f5b4b4 100644
--- a/tests/header_tests/source/table_iterator.cpp
+++ b/tests/header_tests/source/table_iterator.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/thread.cpp b/tests/header_tests/source/thread.cpp
index 0cb332f2..562b3218 100644
--- a/tests/header_tests/source/thread.cpp
+++ b/tests/header_tests/source/thread.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/tie.cpp b/tests/header_tests/source/tie.cpp
index 0c1d6411..34c9f239 100644
--- a/tests/header_tests/source/tie.cpp
+++ b/tests/header_tests/source/tie.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/traits.cpp b/tests/header_tests/source/traits.cpp
index 985b2131..2f3afa7a 100644
--- a/tests/header_tests/source/traits.cpp
+++ b/tests/header_tests/source/traits.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/trampoline.cpp b/tests/header_tests/source/trampoline.cpp
index 7c9ede9a..e1daec2a 100644
--- a/tests/header_tests/source/trampoline.cpp
+++ b/tests/header_tests/source/trampoline.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/tuple.cpp b/tests/header_tests/source/tuple.cpp
index 2d7da9e9..5272fd4b 100644
--- a/tests/header_tests/source/tuple.cpp
+++ b/tests/header_tests/source/tuple.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/types.cpp b/tests/header_tests/source/types.cpp
index 08c6e65b..f32517a8 100644
--- a/tests/header_tests/source/types.cpp
+++ b/tests/header_tests/source/types.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/unicode.cpp b/tests/header_tests/source/unicode.cpp
index ca7b784b..fedc5469 100644
--- a/tests/header_tests/source/unicode.cpp
+++ b/tests/header_tests/source/unicode.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/unique_usertype_traits.cpp b/tests/header_tests/source/unique_usertype_traits.cpp
index c436d4d0..ad297058 100644
--- a/tests/header_tests/source/unique_usertype_traits.cpp
+++ b/tests/header_tests/source/unique_usertype_traits.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/unsafe_function.cpp b/tests/header_tests/source/unsafe_function.cpp
index c44e5456..4f88ab8c 100644
--- a/tests/header_tests/source/unsafe_function.cpp
+++ b/tests/header_tests/source/unsafe_function.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/unsafe_function_result.cpp b/tests/header_tests/source/unsafe_function_result.cpp
index bf41b634..f4402627 100644
--- a/tests/header_tests/source/unsafe_function_result.cpp
+++ b/tests/header_tests/source/unsafe_function_result.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/userdata.cpp b/tests/header_tests/source/userdata.cpp
index 238b6480..4b88b1df 100644
--- a/tests/header_tests/source/userdata.cpp
+++ b/tests/header_tests/source/userdata.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/usertype.cpp b/tests/header_tests/source/usertype.cpp
index 9419a24e..296dc6d6 100644
--- a/tests/header_tests/source/usertype.cpp
+++ b/tests/header_tests/source/usertype.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/usertype_container.cpp b/tests/header_tests/source/usertype_container.cpp
index ecc2c76b..6f97a08a 100644
--- a/tests/header_tests/source/usertype_container.cpp
+++ b/tests/header_tests/source/usertype_container.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/usertype_container_launch.cpp b/tests/header_tests/source/usertype_container_launch.cpp
index 74ffd575..7ee5065a 100644
--- a/tests/header_tests/source/usertype_container_launch.cpp
+++ b/tests/header_tests/source/usertype_container_launch.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/usertype_core.cpp b/tests/header_tests/source/usertype_core.cpp
index 441dfccd..310c3e81 100644
--- a/tests/header_tests/source/usertype_core.cpp
+++ b/tests/header_tests/source/usertype_core.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/usertype_proxy.cpp b/tests/header_tests/source/usertype_proxy.cpp
index ce3691a3..27fee3f7 100644
--- a/tests/header_tests/source/usertype_proxy.cpp
+++ b/tests/header_tests/source/usertype_proxy.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/usertype_storage.cpp b/tests/header_tests/source/usertype_storage.cpp
index 216d32ae..54504ca9 100644
--- a/tests/header_tests/source/usertype_storage.cpp
+++ b/tests/header_tests/source/usertype_storage.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/usertype_traits.cpp b/tests/header_tests/source/usertype_traits.cpp
index 07a97c73..7e87b649 100644
--- a/tests/header_tests/source/usertype_traits.cpp
+++ b/tests/header_tests/source/usertype_traits.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/variadic_args.cpp b/tests/header_tests/source/variadic_args.cpp
index 550dcfe8..87aa4ad5 100644
--- a/tests/header_tests/source/variadic_args.cpp
+++ b/tests/header_tests/source/variadic_args.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/variadic_results.cpp b/tests/header_tests/source/variadic_results.cpp
index d1cc572f..a6c6bdfd 100644
--- a/tests/header_tests/source/variadic_results.cpp
+++ b/tests/header_tests/source/variadic_results.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/version.cpp b/tests/header_tests/source/version.cpp
index ddefa092..17596301 100644
--- a/tests/header_tests/source/version.cpp
+++ b/tests/header_tests/source/version.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/header_tests/source/wrapper.cpp b/tests/header_tests/source/wrapper.cpp
index 7ce0187e..b311efc6 100644
--- a/tests/header_tests/source/wrapper.cpp
+++ b/tests/header_tests/source/wrapper.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/regression_tests/1011/CMakeLists.txt b/tests/regression_tests/1011/CMakeLists.txt
index 7c43b760..397ae9b5 100644
--- a/tests/regression_tests/1011/CMakeLists.txt
+++ b/tests/regression_tests/1011/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -32,7 +32,7 @@ function(CREATE_TEST test_target_name test_name target_sol)
 		OUTPUT_NAME ${test_name}
 		EXPORT_NAME sol2::${test_name})
 	target_link_libraries(${test_target_name} 
-		PUBLIC Threads::Threads ${LUA_LIBRARIES} ${target_sol})
+		PUBLIC Threads::Threads ${LUA_LIBRARIES} ${target_sol} ${CMAKE_DL_LIBS})
 	
 	if (MSVC)
 		if (NOT CMAKE_COMPILER_ID MATCHES "Clang")
@@ -79,11 +79,6 @@ function(CREATE_TEST test_target_name test_name target_sol)
 			PRIVATE SOL2_CI)
 	endif()
 	
-	if (CMAKE_DL_LIBS)
-		target_link_libraries(${test_target_name}
-			PRIVATE ${CMAKE_DL_LIBS})
-	endif()
-	
 	add_test(NAME ${test_name} COMMAND ${test_target_name})
 	if(SOL2_ENABLE_INSTALL)
 		install(TARGETS ${test_target_name} RUNTIME DESTINATION bin)
@@ -94,8 +89,8 @@ if (SOL2_TESTS)
 	CREATE_TEST(regression_1011_tests "regression_1011_tests" sol2::sol2)
 endif()
 if (SOL2_TESTS_SINGLE)
-	CREATE_TEST(regression_1011_tests_single "regression_1011_tests.single" sol2::sol2_single)
+	CREATE_TEST(regression_1011_tests_single "regression_1011_tests.single" sol2::sol2::single)
 endif()
 if (SOL2_TESTS_SINGLE_GENERATED)
-	CREATE_TEST(regression_1011_tests_generated_single "regression_1011_tests.single.generated" sol2::sol2_single_generated)
+	CREATE_TEST(regression_1011_tests_generated_single "regression_1011_tests.single.generated" sol2::sol2::single_generated)
 endif()
diff --git a/tests/regression_tests/CMakeLists.txt b/tests/regression_tests/CMakeLists.txt
index 2691a68f..40206f47 100644
--- a/tests/regression_tests/CMakeLists.txt
+++ b/tests/regression_tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/regression_tests/simple/CMakeLists.txt b/tests/regression_tests/simple/CMakeLists.txt
index 419fc98e..8319538a 100644
--- a/tests/regression_tests/simple/CMakeLists.txt
+++ b/tests/regression_tests/simple/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -32,7 +32,7 @@ function(CREATE_TEST test_target_name test_name target_sol)
 		OUTPUT_NAME ${test_name}
 		EXPORT_NAME sol2::${test_name})
 	target_link_libraries(${test_target_name} 
-		PUBLIC Threads::Threads ${LUA_LIBRARIES} ${target_sol})
+		PUBLIC Threads::Threads ${LUA_LIBRARIES} ${target_sol} ${CMAKE_DL_LIBS})
 	target_compile_definitions(${test_target_name} 
 			PRIVATE SOL_ALL_SAFETIES_ON)
 	if (MSVC)
@@ -52,11 +52,6 @@ function(CREATE_TEST test_target_name test_name target_sol)
 			PRIVATE SOL2_CI)
 	endif()
 	
-	if (CMAKE_DL_LIBS)
-		target_link_libraries(${test_target_name}
-			PRIVATE ${CMAKE_DL_LIBS})
-	endif()
-	
 	add_test(NAME ${test_name} COMMAND ${test_target_name})
 	if(SOL2_ENABLE_INSTALL)
 		install(TARGETS ${test_target_name} RUNTIME DESTINATION bin)
@@ -67,8 +62,8 @@ if (SOL2_TESTS)
 	CREATE_TEST(regression_tests "regression_tests" sol2::sol2)
 endif()
 if (SOL2_TESTS_SINGLE)
-	CREATE_TEST(regression_tests_single "regression_tests.single" sol2::sol2_single)
+	CREATE_TEST(regression_tests_single "regression_tests.single" sol2::sol2::single)
 endif()
 if (SOL2_TESTS_SINGLE_GENERATED)
-	CREATE_TEST(regression_tests_generated_single "regression_tests.single.generated" sol2::sol2_single_generated)
+	CREATE_TEST(regression_tests_generated_single "regression_tests.single.generated" sol2::sol2::single_generated)
 endif()
diff --git a/tests/runtime_tests/CMakeLists.txt b/tests/runtime_tests/CMakeLists.txt
index 905c90bf..cc08ae63 100644
--- a/tests/runtime_tests/CMakeLists.txt
+++ b/tests/runtime_tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 # # # # sol3
 # The MIT License (MIT)
 # 
-# Copyright (c) 2013-2020 Rapptz, ThePhD, and contributors
+# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -22,23 +22,17 @@
 
 # # # # sol3 tests - runtime tests
 
-if (CMAKE_GENERATOR MATCHES "Visual Studio 14 2015")
-	find_package(Catch 1.12.1 REQUIRED)
-else()
-	find_package(Catch REQUIRED)
-endif()
-
 file(GLOB SOL2_RUNTIME_TEST_SOURCES source/*.cpp)
 source_group(test_sources FILES ${SOL2_RUNTIME_TEST_SOURCES})
 
 function(CREATE_TEST test_target_name test_name target_sol)
+	set(test_target_name ${test_target_name})
 	add_executable(${test_target_name} ${SOL2_RUNTIME_TEST_SOURCES})
 	set_target_properties(${test_target_name}
 		PROPERTIES
-		OUTPUT_NAME ${test_name}
-		EXPORT_NAME sol2::${test_name})
+		OUTPUT_NAME ${test_name})
 	target_link_libraries(${test_target_name} 
-		PUBLIC Threads::Threads ${LUA_LIBRARIES} ${CATCH_LIBRARIES} ${target_sol})
+		PUBLIC Threads::Threads ${LUA_LIBRARIES} Catch2::Catch2 ${target_sol} ${CMAKE_DL_LIBS})
 	target_compile_definitions(${test_target_name}
 		PUBLIC SOL_ALL_SAFETIES_ON=1 SOL_PRINT_ERRORS=1 SOL_ENABLE_INTEROP=1)
 	if (MSVC)
@@ -86,11 +80,6 @@ function(CREATE_TEST test_target_name test_name target_sol)
 			PRIVATE SOL2_CI)
 	endif()
 	
-	if (CMAKE_DL_LIBS)
-		target_link_libraries(${test_target_name}
-			PRIVATE ${CMAKE_DL_LIBS})
-	endif()
-	
 	add_test(NAME ${test_name} COMMAND ${test_target_name})
 	if(SOL2_ENABLE_INSTALL)
 		install(TARGETS ${test_target_name} RUNTIME DESTINATION bin)
@@ -98,11 +87,11 @@ function(CREATE_TEST test_target_name test_name target_sol)
 endfunction(CREATE_TEST)
 
 if (SOL2_TESTS)
-	CREATE_TEST(runtime_tests "runtime_tests" sol2::sol2)
+	CREATE_TEST(runtime_tests "sol2.runtime_tests" sol2::sol2)
 endif()
 if (SOL2_TESTS_SINGLE)
-	CREATE_TEST(runtime_tests_single "runtime_tests.single" sol2::sol2_single)
+	CREATE_TEST(runtime_tests_single "sol2.single.runtime_tests" sol2::sol2::single)
 endif()
 if (SOL2_TESTS_SINGLE_GENERATED)
-	CREATE_TEST(runtime_tests_generated_single "runtime_tests.single.generated" sol2::sol2_single_generated)
+	CREATE_TEST(runtime_tests_generated_single "sol2.single.generated.runtime_tests" sol2::sol2::single_generated)
 endif()
diff --git a/tests/runtime_tests/source/basic.cpp b/tests/runtime_tests/source/basic.cpp
index ba08047c..ea14feab 100644
--- a/tests/runtime_tests/source/basic.cpp
+++ b/tests/runtime_tests/source/basic.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <fstream>
 #include <iostream>
diff --git a/tests/runtime_tests/source/common_classes.hpp b/tests/runtime_tests/source/common_classes.hpp
index d56d2b38..74ccbc9e 100644
--- a/tests/runtime_tests/source/common_classes.hpp
+++ b/tests/runtime_tests/source/common_classes.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -144,7 +144,7 @@ public:
 
 struct Vec {
 	float x, y, z;
-	Vec(float x, float y, float z) : x{ x }, y{ y }, z{ z } {
+	Vec(float x, float y, float z) : x { x }, y { y }, z { z } {
 	}
 	float length() {
 		return sqrtf(x * x + y * y + z * z);
diff --git a/tests/runtime_tests/source/container.usertype_check.cpp b/tests/runtime_tests/source/container.usertype_check.cpp
index 68e40883..8f931bd5 100644
--- a/tests/runtime_tests/source/container.usertype_check.cpp
+++ b/tests/runtime_tests/source/container.usertype_check.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 
 struct user_container_type : public std::vector<int> {
diff --git a/tests/runtime_tests/source/container_semantics.cpp b/tests/runtime_tests/source/container_semantics.cpp
index 4d95d9f4..1e7b6ca5 100644
--- a/tests/runtime_tests/source/container_semantics.cpp
+++ b/tests/runtime_tests/source/container_semantics.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iterator>
 #include <vector>
diff --git a/tests/runtime_tests/source/container_semantics.custom.cpp b/tests/runtime_tests/source/container_semantics.custom.cpp
index 0c0fb561..e0c1e856 100644
--- a/tests/runtime_tests/source/container_semantics.custom.cpp
+++ b/tests/runtime_tests/source/container_semantics.custom.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iterator>
 #include <vector>
diff --git a/tests/runtime_tests/source/container_semantics.ordered.cpp b/tests/runtime_tests/source/container_semantics.ordered.cpp
index fe03edf4..748c177a 100644
--- a/tests/runtime_tests/source/container_semantics.ordered.cpp
+++ b/tests/runtime_tests/source/container_semantics.ordered.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <set>
 #include <map>
@@ -288,7 +288,7 @@ TEST_CASE("containers/ordered lookup containers", "check ordered container types
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		std::set<int> items{ 11, 12, 13, 14, 15 };
+		std::set<int> items { 11, 12, 13, 14, 15 };
 		lua["c"] = &items;
 		ordered_container_check(lua, items);
 	}
@@ -304,7 +304,7 @@ TEST_CASE("containers/ordered lookup containers", "check ordered container types
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		std::multiset<int> items{ 11, 12, 13, 14, 15 };
+		std::multiset<int> items { 11, 12, 13, 14, 15 };
 		lua["c"] = &items;
 		ordered_container_check(lua, items);
 	}
@@ -323,7 +323,7 @@ TEST_CASE("containers/associative ordered containers", "check associative (map)
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		std::map<short, int> items{ { (short)11, 21 }, { (short)12, 22 }, { (short)13, 23 }, { (short)14, 24 }, { (short)15, 25 } };
+		std::map<short, int> items { { (short)11, 21 }, { (short)12, 22 }, { (short)13, 23 }, { (short)14, 24 }, { (short)15, 25 } };
 		lua["c"] = &items;
 		associative_ordered_container_check(lua, items);
 	}
@@ -331,7 +331,7 @@ TEST_CASE("containers/associative ordered containers", "check associative (map)
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		std::map<std::string, std::string> items{ { "a", "a" }, { "b", "b" }, { "c", "c" } };
+		std::map<std::string, std::string> items { { "a", "a" }, { "b", "b" }, { "c", "c" } };
 		lua["c"] = &items;
 		ordered_lookup_container_check(lua, items);
 	}
@@ -339,7 +339,7 @@ TEST_CASE("containers/associative ordered containers", "check associative (map)
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		std::multimap<short, int> items{ { (short)11, 21 }, { (short)12, 22 }, { (short)13, 23 }, { (short)14, 24 }, { (short)15, 25 } };
+		std::multimap<short, int> items { { (short)11, 21 }, { (short)12, 22 }, { (short)13, 23 }, { (short)14, 24 }, { (short)15, 25 } };
 		lua["c"] = &items;
 		associative_ordered_container_check(lua, items);
 	}
@@ -347,14 +347,14 @@ TEST_CASE("containers/associative ordered containers", "check associative (map)
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		std::multimap<std::string, std::string> items{ { "a", "a" }, { "b", "b" }, { "c", "c" } };
+		std::multimap<std::string, std::string> items { { "a", "a" }, { "b", "b" }, { "c", "c" } };
 		lua["c"] = &items;
 		ordered_lookup_container_check(lua, items);
 	}
 }
 
 TEST_CASE("containers/associative ordered pairs", "check to make sure pairs works properly for key-value types") {
-	struct bar {};
+	struct bar { };
 	std::unique_ptr<bar> ua(new bar()), ub(new bar()), uc(new bar());
 	bar* a = ua.get();
 	bar* b = ub.get();
diff --git a/tests/runtime_tests/source/container_semantics.unordered.cpp b/tests/runtime_tests/source/container_semantics.unordered.cpp
index 2d4f89a3..d40ba59e 100644
--- a/tests/runtime_tests/source/container_semantics.unordered.cpp
+++ b/tests/runtime_tests/source/container_semantics.unordered.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <unordered_map>
 #include <unordered_set>
@@ -203,7 +203,7 @@ TEST_CASE("containers/unordered lookup containers", "check ordered container typ
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		std::unordered_set<int> items{ 11, 12, 13, 14, 15 };
+		std::unordered_set<int> items { 11, 12, 13, 14, 15 };
 		lua["c"] = &items;
 		unordered_container_check(lua, items);
 	}
@@ -219,7 +219,7 @@ TEST_CASE("containers/unordered lookup containers", "check ordered container typ
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		std::unordered_multiset<int> items{ 11, 12, 13, 14, 15 };
+		std::unordered_multiset<int> items { 11, 12, 13, 14, 15 };
 		lua["c"] = &items;
 		unordered_container_check(lua, items);
 	}
@@ -238,7 +238,7 @@ TEST_CASE("containers/associative unordered containers", "check associative (map
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		std::unordered_map<short, int> items{ { (short)11, 21 }, { (short)12, 22 }, { (short)13, 23 }, { (short)14, 24 }, { (short)15, 25 } };
+		std::unordered_map<short, int> items { { (short)11, 21 }, { (short)12, 22 }, { (short)13, 23 }, { (short)14, 24 }, { (short)15, 25 } };
 		lua["c"] = &items;
 		associative_unordered_container_check(lua, items);
 	}
@@ -246,7 +246,7 @@ TEST_CASE("containers/associative unordered containers", "check associative (map
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		std::unordered_map<std::string, std::string> items{ { "a", "a" }, { "b", "b" }, { "c", "c" } };
+		std::unordered_map<std::string, std::string> items { { "a", "a" }, { "b", "b" }, { "c", "c" } };
 		lua["c"] = &items;
 		unordered_lookup_container_check(lua, items);
 	}
@@ -254,7 +254,7 @@ TEST_CASE("containers/associative unordered containers", "check associative (map
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		std::unordered_multimap<short, int> items{ { (short)11, 21 }, { (short)12, 22 }, { (short)13, 23 }, { (short)14, 24 }, { (short)15, 25 } };
+		std::unordered_multimap<short, int> items { { (short)11, 21 }, { (short)12, 22 }, { (short)13, 23 }, { (short)14, 24 }, { (short)15, 25 } };
 		lua["c"] = &items;
 		associative_unordered_container_check(lua, items);
 	}
@@ -262,7 +262,7 @@ TEST_CASE("containers/associative unordered containers", "check associative (map
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		std::unordered_multimap<std::string, std::string> items{ { "a", "a" }, { "b", "b" }, { "c", "c" } };
+		std::unordered_multimap<std::string, std::string> items { { "a", "a" }, { "b", "b" }, { "c", "c" } };
 		lua["c"] = &items;
 		unordered_lookup_container_check(lua, items);
 	}
diff --git a/tests/runtime_tests/source/container_shims.cpp b/tests/runtime_tests/source/container_shims.cpp
index 66e666a5..abbc4e97 100644
--- a/tests/runtime_tests/source/container_shims.cpp
+++ b/tests/runtime_tests/source/container_shims.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iterator>
 #include <vector>
diff --git a/tests/runtime_tests/source/container_table.cpp b/tests/runtime_tests/source/container_table.cpp
index c2a25754..a27e75b1 100644
--- a/tests/runtime_tests/source/container_table.cpp
+++ b/tests/runtime_tests/source/container_table.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -24,7 +24,7 @@
 #include "sol_test.hpp"
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iterator>
 #include <vector>
diff --git a/tests/runtime_tests/source/containers.cpp b/tests/runtime_tests/source/containers.cpp
index aeab5a89..79853244 100644
--- a/tests/runtime_tests/source/containers.cpp
+++ b/tests/runtime_tests/source/containers.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -24,7 +24,7 @@
 #include "sol_test.hpp"
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iterator>
 #include <vector>
diff --git a/tests/runtime_tests/source/containers.roundtrip.cpp b/tests/runtime_tests/source/containers.roundtrip.cpp
index ea9d916c..5b7d3805 100644
--- a/tests/runtime_tests/source/containers.roundtrip.cpp
+++ b/tests/runtime_tests/source/containers.roundtrip.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -24,7 +24,7 @@
 #include "sol_test.hpp"
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iterator>
 #include <vector>
@@ -39,7 +39,7 @@
 
 TEST_CASE("containers/vector roundtrip", "make sure vectors can be round-tripped") {
 	sol::state lua;
-	std::vector<int> v{ 1, 2, 3 };
+	std::vector<int> v { 1, 2, 3 };
 	lua.set_function("f", [&]() -> std::vector<int>& { return v; });
 	auto result1 = lua.safe_script("x = f()", sol::script_pass_on_error);
 	REQUIRE(result1.valid());
@@ -50,7 +50,7 @@ TEST_CASE("containers/vector roundtrip", "make sure vectors can be round-tripped
 
 TEST_CASE("containers/deque roundtrip", "make sure deques can be round-tripped") {
 	sol::state lua;
-	std::deque<int> v{ 1, 2, 3 };
+	std::deque<int> v { 1, 2, 3 };
 	lua.set_function("f", [&]() -> std::deque<int>& { return v; });
 	auto result1 = lua.safe_script("x = f()", sol::script_pass_on_error);
 	REQUIRE(result1.valid());
@@ -61,7 +61,7 @@ TEST_CASE("containers/deque roundtrip", "make sure deques can be round-tripped")
 
 TEST_CASE("containers/array roundtrip", "make sure arrays can be round-tripped") {
 	sol::state lua;
-	std::array<int, 3> v{ { 1, 2, 3 } };
+	std::array<int, 3> v { { 1, 2, 3 } };
 	lua.set_function("f", [&]() -> std::array<int, 3>& { return v; });
 	auto result1 = lua.safe_script("x = f()", sol::script_pass_on_error);
 	REQUIRE(result1.valid());
@@ -72,7 +72,7 @@ TEST_CASE("containers/array roundtrip", "make sure arrays can be round-tripped")
 
 TEST_CASE("containers/list roundtrip", "make sure lists can be round-tripped") {
 	sol::state lua;
-	std::list<int> v{ 1, 2, 3 };
+	std::list<int> v { 1, 2, 3 };
 	lua.set_function("f", [&]() -> std::list<int>& { return v; });
 	auto result1 = lua.safe_script("x = f()", sol::script_pass_on_error);
 	REQUIRE(result1.valid());
@@ -83,7 +83,7 @@ TEST_CASE("containers/list roundtrip", "make sure lists can be round-tripped") {
 
 TEST_CASE("containers/forward_list roundtrip", "make sure forward_lists can be round-tripped") {
 	sol::state lua;
-	std::forward_list<int> v{ 1, 2, 3 };
+	std::forward_list<int> v { 1, 2, 3 };
 	lua.set_function("f", [&]() -> std::forward_list<int>& { return v; });
 	auto result1 = lua.safe_script("x = f()", sol::script_pass_on_error);
 	REQUIRE(result1.valid());
@@ -94,7 +94,7 @@ TEST_CASE("containers/forward_list roundtrip", "make sure forward_lists can be r
 
 TEST_CASE("containers/map roundtrip", "make sure maps can be round-tripped") {
 	sol::state lua;
-	std::map<std::string, int> v{ { "a", 1 }, { "b", 2 }, { "c", 3 } };
+	std::map<std::string, int> v { { "a", 1 }, { "b", 2 }, { "c", 3 } };
 	lua.set_function("f", [&]() -> std::map<std::string, int>& { return v; });
 	auto result1 = lua.safe_script("x = f()", sol::script_pass_on_error);
 	REQUIRE(result1.valid());
@@ -105,7 +105,7 @@ TEST_CASE("containers/map roundtrip", "make sure maps can be round-tripped") {
 
 TEST_CASE("containers/unordered_map roundtrip", "make sure unordered_maps can be round-tripped") {
 	sol::state lua;
-	std::unordered_map<std::string, int> v{ { "a", 1 }, { "b", 2 }, { "c", 3 } };
+	std::unordered_map<std::string, int> v { { "a", 1 }, { "b", 2 }, { "c", 3 } };
 	lua.set_function("f", [&]() -> std::unordered_map<std::string, int>& { return v; });
 	auto result1 = lua.safe_script("x = f()", sol::script_pass_on_error);
 	REQUIRE(result1.valid());
@@ -116,7 +116,7 @@ TEST_CASE("containers/unordered_map roundtrip", "make sure unordered_maps can be
 
 TEST_CASE("containers/unordered_set roundtrip", "make sure unordered_sets can be round-tripped") {
 	sol::state lua;
-	std::unordered_set<int> v{ 1, 2, 3 };
+	std::unordered_set<int> v { 1, 2, 3 };
 	lua.set_function("f", [&]() -> std::unordered_set<int>& { return v; });
 	auto result1 = lua.safe_script("x = f()", sol::script_pass_on_error);
 	REQUIRE(result1.valid());
@@ -127,7 +127,7 @@ TEST_CASE("containers/unordered_set roundtrip", "make sure unordered_sets can be
 
 TEST_CASE("containers/set roundtrip", "make sure sets can be round-tripped") {
 	sol::state lua;
-	std::set<int> v{ 1, 2, 3 };
+	std::set<int> v { 1, 2, 3 };
 	lua.set_function("f", [&]() -> std::set<int>& { return v; });
 	auto result1 = lua.safe_script("x = f()", sol::script_pass_on_error);
 	REQUIRE(result1.valid());
@@ -140,7 +140,7 @@ TEST_CASE("containers/ipairs test", "ensure that abstractions roundtrip properly
 	struct thing {
 		int x = 20;
 	};
-	thing t{};
+	thing t {};
 	sol::state lua;
 	lua.open_libraries();
 
diff --git a/tests/runtime_tests/source/containers.table.cpp b/tests/runtime_tests/source/containers.table.cpp
index ee371fcc..9f6e8e56 100644
--- a/tests/runtime_tests/source/containers.table.cpp
+++ b/tests/runtime_tests/source/containers.table.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -24,7 +24,7 @@
 #include "sol_test.hpp"
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iterator>
 #include <vector>
@@ -39,19 +39,19 @@
 
 
 auto test_table_return_one() {
-	return sol::as_table(std::vector<int>{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
+	return sol::as_table(std::vector<int> { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 });
 }
 
 auto test_table_return_two() {
-	return sol::as_table(std::vector<std::pair<std::string, int>>{ { "one", 1 }, { "two", 2 }, { "three", 3 } });
+	return sol::as_table(std::vector<std::pair<std::string, int>> { { "one", 1 }, { "two", 2 }, { "three", 3 } });
 }
 
 auto test_table_return_three() {
-	return sol::as_table(std::map<std::string, std::string>{ { "name", "Rapptz" }, { "friend", "ThePhD" }, { "project", "sol" } });
+	return sol::as_table(std::map<std::string, std::string> { { "name", "Rapptz" }, { "friend", "ThePhD" }, { "project", "sol" } });
 }
 
 auto test_table_return_four() {
-	return sol::as_table(std::array<std::pair<std::string, int>, 4>{ { { "one", 1 }, { "two", 2 }, { "three", 3 }, { "four", 4 } } });
+	return sol::as_table(std::array<std::pair<std::string, int>, 4> { { { "one", 1 }, { "two", 2 }, { "three", 3 }, { "four", 4 } } });
 }
 
 template <typename S, typename T>
@@ -160,12 +160,12 @@ TEST_CASE("containers/table serialization", "ensure types can be serialized as t
 	typedef std::vector<int> woof;
 	sol::state lua;
 	lua.open_libraries();
-	lua.set("b", sol::as_table(woof{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 }));
+	lua.set("b", sol::as_table(woof { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 }));
 	{
 		auto result = lua.safe_script("for k, v in ipairs(b) do assert(k == v) end", sol::script_pass_on_error);
 		REQUIRE(result.valid());
 	}
-	woof w{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 };
+	woof w { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 };
 	lua.set("b", sol::as_table(w));
 	{
 		auto result = lua.safe_script("for k, v in ipairs(b) do assert(k == v) end", sol::script_pass_on_error);
@@ -210,9 +210,9 @@ end
 	SECTION("map-like") {
 		sol::state lua;
 		lua.open_libraries(sol::lib::base, sol::lib::table);
-		std::pair<const std::string, int> src[5]{ { "a", 21 }, { "b", 22 }, { "c", 23 }, { "d", 24 }, { "e", 25 } };
+		std::pair<const std::string, int> src[5] { { "a", 21 }, { "b", 22 }, { "c", 23 }, { "d", 24 }, { "e", 25 } };
 
-		lua["c"] = std::initializer_list<std::pair<std::string, int>>{ { "a", 21 }, { "b", 22 }, { "c", 23 }, { "d", 24 }, { "e", 25 } };
+		lua["c"] = std::initializer_list<std::pair<std::string, int>> { { "a", 21 }, { "b", 22 }, { "c", 23 }, { "d", 24 }, { "e", 25 } };
 
 		sol::as_table_t<std::unordered_map<std::string, int>> t1umap = lua["c"];
 		sol::as_table_t<std::unordered_multimap<std::string, int>> t1ummap = lua["c"];
@@ -226,7 +226,8 @@ TEST_CASE("containers/as_table with pointers", "test to make sure pointers are r
 
 	struct Entity {
 	public:
-		Entity(EHandle) {}
+		Entity(EHandle) {
+		}
 		Entity(const Entity&) = default;
 		Entity(Entity&&) = default;
 		Entity& operator=(const Entity&) = default;
@@ -236,7 +237,7 @@ TEST_CASE("containers/as_table with pointers", "test to make sure pointers are r
 	auto test_func_vec = []() -> std::vector<Entity*> {
 		return { reinterpret_cast<Entity*>(0x01), reinterpret_cast<Entity*>(0x02), reinterpret_cast<Entity*>(0x03) };
 	};
-	
+
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 	lua.new_usertype<Entity>("Entity");
diff --git a/tests/runtime_tests/source/coroutines.cpp b/tests/runtime_tests/source/coroutines.cpp
index b7b7a99d..a45f789b 100644
--- a/tests/runtime_tests/source/coroutines.cpp
+++ b/tests/runtime_tests/source/coroutines.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <vector>
 
diff --git a/tests/runtime_tests/source/customizations.cpp b/tests/runtime_tests/source/customizations.cpp
index 2a405cbe..dd046580 100644
--- a/tests/runtime_tests/source/customizations.cpp
+++ b/tests/runtime_tests/source/customizations.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <unordered_map>
 #include <vector>
diff --git a/tests/runtime_tests/source/customizations_private.cpp b/tests/runtime_tests/source/customizations_private.cpp
index 5efd23f8..58851842 100644
--- a/tests/runtime_tests/source/customizations_private.cpp
+++ b/tests/runtime_tests/source/customizations_private.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <unordered_map>
 #include <vector>
@@ -49,13 +49,13 @@ struct number_shim {
 namespace sol {
 
 	template <>
-	struct lua_size<two_things> : std::integral_constant<int, 2> {};
+	struct lua_size<two_things> : std::integral_constant<int, 2> { };
 
 	template <>
-	struct lua_type_of<two_things> : std::integral_constant<sol::type, sol::type::poly> {};
+	struct lua_type_of<two_things> : std::integral_constant<sol::type, sol::type::poly> { };
 
 	template <>
-	struct lua_type_of<number_shim> : std::integral_constant<sol::type, sol::type::poly> {};
+	struct lua_type_of<number_shim> : std::integral_constant<sol::type, sol::type::poly> { };
 
 	namespace stack {
 
@@ -75,7 +75,7 @@ namespace sol {
 				int a = stack::get<int>(L, index);
 				bool b = stack::get<bool>(L, index + 1);
 				tracking.use(2);
-				return two_things{ a, b };
+				return two_things { a, b };
 			}
 		};
 
@@ -108,7 +108,7 @@ namespace sol {
 					number_shim& ns = get_usertype<number_shim>(L, index, tracking);
 					return ns;
 				}
-				number_shim ns{};
+				number_shim ns {};
 				ns.num = stack::get<double>(L, index, tracking);
 				return ns;
 			}
@@ -144,13 +144,13 @@ TEST_CASE("customization/split struct", "using the old customization points to h
 	sol::function f = lua["f"];
 	sol::function g = lua["g"];
 
-	two_things thingsf = f(two_things{ 24, true }, 1);
+	two_things thingsf = f(two_things { 24, true }, 1);
 	REQUIRE(thingsf.a == 25);
 	REQUIRE(thingsf.b);
 
 	two_things thingsg;
 	double d;
-	sol::tie(thingsg, d) = g(two_things{ 25, false }, 2, 34.0);
+	sol::tie(thingsg, d) = g(two_things { 25, false }, 2, 34.0);
 	REQUIRE(thingsg.a == 27);
 	REQUIRE_FALSE(thingsg.b);
 	REQUIRE(d == 36.5);
diff --git a/tests/runtime_tests/source/dump.cpp b/tests/runtime_tests/source/dump.cpp
index eafaead9..8f8c5b0f 100644
--- a/tests/runtime_tests/source/dump.cpp
+++ b/tests/runtime_tests/source/dump.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <list>
 #include <vector>
diff --git a/tests/runtime_tests/source/environments.cpp b/tests/runtime_tests/source/environments.cpp
index 51ab7001..a1d5bb4c 100644
--- a/tests/runtime_tests/source/environments.cpp
+++ b/tests/runtime_tests/source/environments.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 
diff --git a/tests/runtime_tests/source/functions.cpp b/tests/runtime_tests/source/functions.cpp
index 8d84d7e0..9bfce6a8 100644
--- a/tests/runtime_tests/source/functions.cpp
+++ b/tests/runtime_tests/source/functions.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -24,7 +24,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 
diff --git a/tests/runtime_tests/source/functions.std.cpp b/tests/runtime_tests/source/functions.std.cpp
index d4146d68..71d4d566 100644
--- a/tests/runtime_tests/source/functions.std.cpp
+++ b/tests/runtime_tests/source/functions.std.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 
diff --git a/tests/runtime_tests/source/gc.cpp b/tests/runtime_tests/source/gc.cpp
index 737bd11c..c089d892 100644
--- a/tests/runtime_tests/source/gc.cpp
+++ b/tests/runtime_tests/source/gc.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/tests/runtime_tests/source/large_integer.cpp b/tests/runtime_tests/source/large_integer.cpp
index 5eeb650f..aab4fc08 100644
--- a/tests/runtime_tests/source/large_integer.cpp
+++ b/tests/runtime_tests/source/large_integer.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <cstdint>
 #include <limits>
diff --git a/tests/runtime_tests/source/lua_value.cpp b/tests/runtime_tests/source/lua_value.cpp
index 1b77d2d2..12142d6c 100644
--- a/tests/runtime_tests/source/lua_value.cpp
+++ b/tests/runtime_tests/source/lua_value.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <vector>
 #include <map>
diff --git a/tests/runtime_tests/source/main.cpp b/tests/runtime_tests/source/main.cpp
index 52d33f23..ecfa2606 100644
--- a/tests/runtime_tests/source/main.cpp
+++ b/tests/runtime_tests/source/main.cpp
@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_RUNNER
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 int main(int argc, char* argv[]) {
 	int result = Catch::Session().run(argc, argv);
diff --git a/tests/runtime_tests/source/operators.cpp b/tests/runtime_tests/source/operators.cpp
index c4b55869..b32a3734 100644
--- a/tests/runtime_tests/source/operators.cpp
+++ b/tests/runtime_tests/source/operators.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <algorithm>
 #include <numeric>
diff --git a/tests/runtime_tests/source/overflow.cpp b/tests/runtime_tests/source/overflow.cpp
index 99bfdab5..4a36765c 100644
--- a/tests/runtime_tests/source/overflow.cpp
+++ b/tests/runtime_tests/source/overflow.cpp
@@ -1,8 +1,8 @@
-// sol3 
+// sol3
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 TEST_CASE("issues/stack overflow", "make sure various operations repeated don't trigger stack overflow") {
 	sol::state lua;
diff --git a/tests/runtime_tests/source/plain_types.cpp b/tests/runtime_tests/source/plain_types.cpp
index 71b1d5ee..f2d4a457 100644
--- a/tests/runtime_tests/source/plain_types.cpp
+++ b/tests/runtime_tests/source/plain_types.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -25,7 +25,7 @@
 #include "common_classes.hpp"
 
 #include <sol/sol.hpp>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 
 TEST_CASE("plain/alignment", "test that aligned classes in certain compilers don't trigger compiler errors") {
diff --git a/tests/runtime_tests/source/policies.cpp b/tests/runtime_tests/source/policies.cpp
index b505da77..62a4315d 100644
--- a/tests/runtime_tests/source/policies.cpp
+++ b/tests/runtime_tests/source/policies.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 #include <string>
diff --git a/tests/runtime_tests/source/proxies.cpp b/tests/runtime_tests/source/proxies.cpp
index ee595647..2701be4d 100644
--- a/tests/runtime_tests/source/proxies.cpp
+++ b/tests/runtime_tests/source/proxies.cpp
@@ -1,8 +1,8 @@
-// sol3 
+// sol3
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 
@@ -50,7 +50,7 @@ TEST_CASE("proxy/function results", "make sure that function results return prop
 }
 
 TEST_CASE("proxy/optional conversion", "make sure optional conversions out of a table work properly") {
-	sol::state state{};
+	sol::state state {};
 	sol::table table = state.create_table_with("func", 42);
 	sol::optional<sol::function> func = table["func"];
 	REQUIRE(func == sol::nullopt);
@@ -60,7 +60,7 @@ TEST_CASE("proxy/proper-pushing", "allow proxies to reference other proxies and
 	sol::state lua;
 	lua.open_libraries(sol::lib::base, sol::lib::io);
 
-	class T {};
+	class T { };
 	lua.new_usertype<T>("T");
 
 	T t;
diff --git a/tests/runtime_tests/source/sol_test.hpp b/tests/runtime_tests/source/sol_test.hpp
index 3df67c0f..082f9e0e 100644
--- a/tests/runtime_tests/source/sol_test.hpp
+++ b/tests/runtime_tests/source/sol_test.hpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/tests/runtime_tests/source/state.cpp b/tests/runtime_tests/source/state.cpp
index 6003a05b..94fdf7b8 100644
--- a/tests/runtime_tests/source/state.cpp
+++ b/tests/runtime_tests/source/state.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 #include <fstream>
diff --git a/tests/runtime_tests/source/storage.cpp b/tests/runtime_tests/source/storage.cpp
index ac323bc7..5a1ab5f6 100644
--- a/tests/runtime_tests/source/storage.cpp
+++ b/tests/runtime_tests/source/storage.cpp
@@ -1,8 +1,8 @@
-// sol3 
+// sol3
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -26,7 +26,7 @@
 
 #include <sol/sol.hpp>
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 TEST_CASE("storage/registry construction", "ensure entries from the registry can be retrieved") {
 	const auto& code = R"(
diff --git a/tests/runtime_tests/source/strings.cpp b/tests/runtime_tests/source/strings.cpp
index 17e689fb..edcdcb56 100644
--- a/tests/runtime_tests/source/strings.cpp
+++ b/tests/runtime_tests/source/strings.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 
diff --git a/tests/runtime_tests/source/tables.checks.cpp b/tests/runtime_tests/source/tables.checks.cpp
index 19dfb1fe..53ed22da 100644
--- a/tests/runtime_tests/source/tables.checks.cpp
+++ b/tests/runtime_tests/source/tables.checks.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,9 +23,9 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
-struct not_a_table_at_all {};
+struct not_a_table_at_all { };
 
 TEST_CASE("tables/lua_table", "check that lua_table accepts only lua-style tables, and not other types") {
 	sol::state lua;
@@ -33,13 +33,13 @@ TEST_CASE("tables/lua_table", "check that lua_table accepts only lua-style table
 		int x = lt["a"];
 		REQUIRE(x == 3);
 	};
-	lua["ud"] = not_a_table_at_all{};
+	lua["ud"] = not_a_table_at_all {};
 
 	auto result0 = lua.safe_script("t = { a = 3 }", sol::script_pass_on_error);
 	REQUIRE(result0.valid());
 	auto result1 = lua.safe_script("f(t)", sol::script_pass_on_error);
 	REQUIRE(result1.valid());
-	
+
 	auto result2 = lua.safe_script("f(ud)", sol::script_pass_on_error);
 	REQUIRE_FALSE(result2.valid());
 	auto result3 = lua.safe_script("f(24)", sol::script_pass_on_error);
diff --git a/tests/runtime_tests/source/tables.clear.cpp b/tests/runtime_tests/source/tables.clear.cpp
index 2df873b2..b4bf8c60 100644
--- a/tests/runtime_tests/source/tables.clear.cpp
+++ b/tests/runtime_tests/source/tables.clear.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 TEST_CASE("tables/clear", "clear method works and does not clobber stack") {
 	sol::state lua;
diff --git a/tests/runtime_tests/source/tables.cpp b/tests/runtime_tests/source/tables.cpp
index 2a990a67..c4b25627 100644
--- a/tests/runtime_tests/source/tables.cpp
+++ b/tests/runtime_tests/source/tables.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 #include <algorithm>
@@ -199,7 +199,8 @@ TEST_CASE("tables/add", "Basic test to make sure the 'add' feature works") {
 TEST_CASE("tables/raw set and raw get", "ensure raw setting and getting works through metatables") {
 	sol::state lua;
 	sol::table t = lua.create_table();
-	t[sol::metatable_key] = lua.create_table_with(sol::meta_function::new_index,
+	t[sol::metatable_key] = lua.create_table_with(
+	     sol::meta_function::new_index,
 	     [](lua_State* L) { return luaL_error(L, "nay"); },
 	     sol::meta_function::index,
 	     [](lua_State* L) { return luaL_error(L, "nay"); });
@@ -273,7 +274,7 @@ TEST_CASE("table/proxy call", "test proxy calls put the variable in the right pl
 	sol::stack_guard luasg(lua);
 	{
 		sol::stack_guard tsg(lua);
-		lua["t"] = std::initializer_list<std::pair<int, std::string_view>>{ { 1, "borf" }, { 2, "bjork" }, { 3, "waf" } };
+		lua["t"] = std::initializer_list<std::pair<int, std::string_view>> { { 1, "borf" }, { 2, "bjork" }, { 3, "waf" } };
 	}
 	{
 		sol::stack_guard fsg(lua);
diff --git a/tests/runtime_tests/source/tables.enums.cpp b/tests/runtime_tests/source/tables.enums.cpp
index ec8ea6fe..2de12f25 100644
--- a/tests/runtime_tests/source/tables.enums.cpp
+++ b/tests/runtime_tests/source/tables.enums.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 enum weak_direction { up, down, left, right };
 enum class strong_direction { up, down, left, right };
@@ -64,7 +64,15 @@ TEST_CASE("tables/new_enum", "Making sure enums can be put in and gotten out as
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		lua.new_enum("strong_direction", "up", strong_direction::up, "down", strong_direction::down, "left", strong_direction::left, "right", strong_direction::right);
+		lua.new_enum("strong_direction",
+		     "up",
+		     strong_direction::up,
+		     "down",
+		     strong_direction::down,
+		     "left",
+		     strong_direction::left,
+		     "right",
+		     strong_direction::right);
 
 		strong_direction d = lua["strong_direction"]["left"];
 		REQUIRE(d == strong_direction::left);
@@ -77,8 +85,11 @@ TEST_CASE("tables/new_enum", "Making sure enums can be put in and gotten out as
 		sol::state lua;
 		lua.open_libraries(sol::lib::base);
 
-		lua.new_enum<strong_direction>(
-		     "strong_direction", { { "up", strong_direction::up }, { "down", strong_direction::down }, { "left", strong_direction::left }, { "right", strong_direction::right } });
+		lua.new_enum<strong_direction>("strong_direction",
+		     { { "up", strong_direction::up },
+		          { "down", strong_direction::down },
+		          { "left", strong_direction::left },
+		          { "right", strong_direction::right } });
 
 		strong_direction d = lua["strong_direction"]["left"];
 		REQUIRE(d == strong_direction::left);
diff --git a/tests/runtime_tests/source/tables.indexing.cpp b/tests/runtime_tests/source/tables.indexing.cpp
index 3490bc9c..f76a86a5 100644
--- a/tests/runtime_tests/source/tables.indexing.cpp
+++ b/tests/runtime_tests/source/tables.indexing.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 int plop_xyz(int x, int y, std::string z) {
 	INFO(x << " " << y << " " << z);
@@ -148,4 +148,3 @@ TEST_CASE("tables/operator[] optional", "Test if proxies on tables can lazily ev
 	REQUIRE(non_nope3.value() == 35);
 	REQUIRE(non_nope4.value() == 35);
 }
-
diff --git a/tests/runtime_tests/source/tables.insertion.cpp b/tests/runtime_tests/source/tables.insertion.cpp
index 06d949f0..e2f33da3 100644
--- a/tests/runtime_tests/source/tables.insertion.cpp
+++ b/tests/runtime_tests/source/tables.insertion.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 
diff --git a/tests/runtime_tests/source/tables.traversal.cpp b/tests/runtime_tests/source/tables.traversal.cpp
index f2a3de62..87d754c4 100644
--- a/tests/runtime_tests/source/tables.traversal.cpp
+++ b/tests/runtime_tests/source/tables.traversal.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 inline namespace sol2_tables_test {
 	inline int my_custom_next(lua_State* L_) noexcept {
diff --git a/tests/runtime_tests/source/usertypes.auxiliary_keys.cpp b/tests/runtime_tests/source/usertypes.auxiliary_keys.cpp
index d6466939..fd1b0087 100644
--- a/tests/runtime_tests/source/usertypes.auxiliary_keys.cpp
+++ b/tests/runtime_tests/source/usertypes.auxiliary_keys.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -25,7 +25,7 @@
 
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 #include <list>
diff --git a/tests/runtime_tests/source/usertypes.basic.cpp b/tests/runtime_tests/source/usertypes.basic.cpp
index 0ef53f13..a4b13b8e 100644
--- a/tests/runtime_tests/source/usertypes.basic.cpp
+++ b/tests/runtime_tests/source/usertypes.basic.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -25,7 +25,7 @@
 
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 
 TEST_CASE("usertype/usertype", "Show that we can create classes from usertype and use them") {
@@ -242,8 +242,8 @@ TEST_CASE("usertype/get-set-references", "properly get and set with std::ref sem
 	sol::state lua;
 
 	lua.new_usertype<vars>("vars", "boop", &vars::boop);
-	vars var{};
-	vars rvar{};
+	vars var {};
+	vars rvar {};
 	std::cout << "setting beep" << std::endl;
 	lua.set("beep", var);
 	std::cout << "setting rbeep" << std::endl;
diff --git a/tests/runtime_tests/source/usertypes.constructors.cpp b/tests/runtime_tests/source/usertypes.constructors.cpp
index da2ed661..a095936c 100644
--- a/tests/runtime_tests/source/usertypes.constructors.cpp
+++ b/tests/runtime_tests/source/usertypes.constructors.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -25,7 +25,7 @@
 
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 inline namespace sol2_test_usertypes_constructors {
 
diff --git a/tests/runtime_tests/source/usertypes.cpp b/tests/runtime_tests/source/usertypes.cpp
index baf8ba58..b7684822 100644
--- a/tests/runtime_tests/source/usertypes.cpp
+++ b/tests/runtime_tests/source/usertypes.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -25,7 +25,7 @@
 
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 #include <list>
diff --git a/tests/runtime_tests/source/usertypes.inheritance.cpp b/tests/runtime_tests/source/usertypes.inheritance.cpp
index 03a246b4..b4bcca13 100644
--- a/tests/runtime_tests/source/usertypes.inheritance.cpp
+++ b/tests/runtime_tests/source/usertypes.inheritance.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -25,7 +25,7 @@
 
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 
@@ -52,21 +52,31 @@ inline namespace sol2_test_usertypes_inheritance {
 
 	class A {
 	public:
-		void hello() { std::cout << "This is class A" << std::endl; }
-		virtual void vhello() { std::cout << "A::vhello" << std::endl; }
-		virtual ~A() {}
+		void hello() {
+			std::cout << "This is class A" << std::endl;
+		}
+		virtual void vhello() {
+			std::cout << "A::vhello" << std::endl;
+		}
+		virtual ~A() {
+		}
+
 	public:
 		int a = 1;
 	};
 
 	class B : public A {
 	public:
-		virtual void vhello() override { std::cout << "B::vhello" << std::endl; }
-		virtual ~B() override {}
+		virtual void vhello() override {
+			std::cout << "B::vhello" << std::endl;
+		}
+		virtual ~B() override {
+		}
+
 	public:
 		int b = 2;
 	};
-}
+} // namespace sol2_test_usertypes_inheritance
 
 SOL_BASE_CLASSES(inh_test_D, inh_test_C);
 SOL_BASE_CLASSES(inh_test_C, inh_test_B, inh_test_A);
@@ -105,7 +115,8 @@ TEST_CASE("inheritance/basic", "test that metatables are properly inherited") {
 	REQUIRE(a == 5);
 }
 
-TEST_CASE("inheritance/usertype derived non-hiding", "usertype classes must play nice when a derived class does not overload a publically visible base function") {
+TEST_CASE(
+     "inheritance/usertype derived non-hiding", "usertype classes must play nice when a derived class does not overload a publically visible base function") {
 	sol::state lua;
 	lua.open_libraries(sol::lib::base);
 	sol::constructors<sol::types<int>> basector;
@@ -133,9 +144,18 @@ TEST_CASE("inheritance/usertype derived non-hiding", "usertype classes must play
 	REQUIRE((lua.get<int>("dgn") == 7));
 }
 
-TEST_CASE("inheritance/usertype metatable interference", "usertypes with overriden index/new_index methods (from e.g. base classes) were intercepting calls to the named metatable") {
+TEST_CASE("inheritance/usertype metatable interference",
+     "usertypes with overriden index/new_index methods (from e.g. base classes) were intercepting calls to the named metatable") {
 	sol::state lua;
-	lua.open_libraries(sol::lib::base, sol::lib::package, sol::lib::coroutine, sol::lib::string, sol::lib::os, sol::lib::math, sol::lib::table, sol::lib::io, sol::lib::debug);
+	lua.open_libraries(sol::lib::base,
+	     sol::lib::package,
+	     sol::lib::coroutine,
+	     sol::lib::string,
+	     sol::lib::os,
+	     sol::lib::math,
+	     sol::lib::table,
+	     sol::lib::io,
+	     sol::lib::debug);
 
 	sol::usertype<A> uta = lua.new_usertype<A>("A", sol::base_classes, sol::base_list<>());
 	uta.set(sol::call_constructor, sol::constructors<A()>());
@@ -151,18 +171,21 @@ TEST_CASE("inheritance/usertype metatable interference", "usertypes with overrid
 	sol::optional<sol::error> maybe_error0 = lua.safe_script(R"(
 	local aa = A()
 	aa:hello()
-	)", sol::script_pass_on_error);
+	)",
+	     sol::script_pass_on_error);
 	REQUIRE_FALSE(maybe_error0.has_value());
 
 	sol::optional<sol::error> maybe_error1 = lua.safe_script(R"(
 	local bb0 = B.new()
 	bb0:hello()
-	)", sol::script_pass_on_error);
+	)",
+	     sol::script_pass_on_error);
 	REQUIRE_FALSE(maybe_error1.has_value());
 
 	sol::optional<sol::error> maybe_error2 = lua.safe_script(R"(
 	local bb1 = B()
 	bb1:hello()
-	)", sol::script_pass_on_error);
+	)",
+	     sol::script_pass_on_error);
 	REQUIRE_FALSE(maybe_error2.has_value());
 }
diff --git a/tests/runtime_tests/source/usertypes.inheritance.multi.cpp b/tests/runtime_tests/source/usertypes.inheritance.multi.cpp
index d1fe174b..47183afe 100644
--- a/tests/runtime_tests/source/usertypes.inheritance.multi.cpp
+++ b/tests/runtime_tests/source/usertypes.inheritance.multi.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -25,7 +25,7 @@
 
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 
diff --git a/tests/runtime_tests/source/usertypes.member_variables.cpp b/tests/runtime_tests/source/usertypes.member_variables.cpp
index 310065de..941d3a58 100644
--- a/tests/runtime_tests/source/usertypes.member_variables.cpp
+++ b/tests/runtime_tests/source/usertypes.member_variables.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -25,7 +25,7 @@
 
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 
 TEST_CASE("usertype/member-variables", "allow table-like accessors to behave as member variables for usertype") {
diff --git a/tests/runtime_tests/source/usertypes.overload.cpp b/tests/runtime_tests/source/usertypes.overload.cpp
index 816434a5..0eebe76d 100644
--- a/tests/runtime_tests/source/usertypes.overload.cpp
+++ b/tests/runtime_tests/source/usertypes.overload.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -25,7 +25,7 @@
 
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 inline namespace sol2_test_usertypes_overload {
 
diff --git a/tests/runtime_tests/source/usertypes.properties.cpp b/tests/runtime_tests/source/usertypes.properties.cpp
index 49645812..789dcae1 100644
--- a/tests/runtime_tests/source/usertypes.properties.cpp
+++ b/tests/runtime_tests/source/usertypes.properties.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -31,7 +31,7 @@
 
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 bool something_func_true() {
 	return true;
diff --git a/tests/runtime_tests/source/usertypes.runtime.cpp b/tests/runtime_tests/source/usertypes.runtime.cpp
index 15a261ea..bb81b71f 100644
--- a/tests/runtime_tests/source/usertypes.runtime.cpp
+++ b/tests/runtime_tests/source/usertypes.runtime.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -25,7 +25,7 @@
 
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <iostream>
 #include <list>
diff --git a/tests/runtime_tests/source/usertypes.unique.cpp b/tests/runtime_tests/source/usertypes.unique.cpp
index 8246af7a..de8ddce3 100644
--- a/tests/runtime_tests/source/usertypes.unique.cpp
+++ b/tests/runtime_tests/source/usertypes.unique.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -25,7 +25,7 @@
 
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 inline namespace sol2_test_usertype_unique {
 	template <typename Type, typename Deleter = std::default_delete<Type>>
diff --git a/tests/runtime_tests/source/usertypes.unregister.cpp b/tests/runtime_tests/source/usertypes.unregister.cpp
index e2490548..52a9cf78 100644
--- a/tests/runtime_tests/source/usertypes.unregister.cpp
+++ b/tests/runtime_tests/source/usertypes.unregister.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 inline namespace sol2_tests_usertypes_unregister {
 	struct unregister_me {
diff --git a/tests/runtime_tests/source/utility.cpp b/tests/runtime_tests/source/utility.cpp
index 78aff48a..966d57a9 100644
--- a/tests/runtime_tests/source/utility.cpp
+++ b/tests/runtime_tests/source/utility.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -24,7 +24,7 @@
 #include "sol_test.hpp"
 #include "common_classes.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <mutex>
 #include <thread>
@@ -116,7 +116,7 @@ namespace detail {
 		using type = Optional<U>;
 	};
 
-	struct dummy {};
+	struct dummy { };
 } // namespace detail
 
 #define Optional typename detail::optional_rebinder<TestType>::template type
diff --git a/tests/runtime_tests/source/variadics.cpp b/tests/runtime_tests/source/variadics.cpp
index 7d9d7b3d..4e9c4518 100644
--- a/tests/runtime_tests/source/variadics.cpp
+++ b/tests/runtime_tests/source/variadics.cpp
@@ -2,7 +2,7 @@
 
 // The MIT License (MIT)
 
-// Copyright (c) 2013-2020 Rapptz, ThePhD and contributors
+// Copyright (c) 2013-2021 Rapptz, ThePhD and contributors
 
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
@@ -23,7 +23,7 @@
 
 #include "sol_test.hpp"
 
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <deque>
 #include <set>