diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 85ff9b5..8dbacb7 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -26,11 +26,11 @@
 
 ## Files to change
 
-:exclamation: Before you make any changes, note the single-header file [`src/json.hpp`](https://github.com/nlohmann/json/blob/develop/src/json.hpp) is **generated** from the source files in the [`develop` directory](https://github.com/nlohmann/json/tree/develop/develop). Please **do not** edit file `src/json.hpp` directly, but change the `develop` sources and regenerate file `src/json.hpp` by executing `make amalgamate`.
+:exclamation: Before you make any changes, note the single-header file [`single_include/nlohmann/json.hpp`](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp) is **generated** from the source files in the [`include/nlohmann` directory](https://github.com/nlohmann/json/tree/develop/include/nlohmann). Please **do not** edit file `single_include/nlohmann/json.hpp` directly, but change the `include/nlohmann` sources and regenerate file `single_include/nlohmann/json.hpp` by executing `make amalgamate`.
 
 To make changes, you need to edit the following files:
 
-1. [`develop/*`](https://github.com/nlohmann/json/tree/develop/develop) - These files are the sources of the library. Before testing or creating a pull request, execute `make amalgamate` to regenerate `src/json.hpp`.
+1. [`include/nlohmann/*`](https://github.com/nlohmann/json/tree/develop/include/nlohmann) - These files are the sources of the library. Before testing or creating a pull request, execute `make amalgamate` to regenerate `single_include/nlohmann/json.hpp`.
 
 2. [`test/src/unit-*.cpp`](https://github.com/nlohmann/json/tree/develop/test/src) - These files contain the [Catch](https://github.com/philsquared/Catch) unit tests which currently cover [100 %](https://coveralls.io/github/nlohmann/json) of the library's code.
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5863d0b..d75a67b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -9,7 +9,7 @@
 - [ ]  Changes are described in the pull request, or an [existing issue is referenced](https://github.com/nlohmann/json/issues).
 - [ ]  The test suite [compiles and runs](https://github.com/nlohmann/json/blob/develop/README.md#execute-unit-tests) without error.
 - [ ]  [Code coverage](https://coveralls.io/github/nlohmann/json) is 100%. Test cases can be added by editing the [test suite](https://github.com/nlohmann/json/tree/develop/test/src).
-- [ ]  The source code is amalgamated; that is, after making changes to the sources in the `develop` directory, run `make amalgamate` to create the single-header file `src/json.hpp`. The whole process is described [here](https://github.com/nlohmann/json/blob/develop/.github/CONTRIBUTING.md#files-to-change).
+- [ ]  The source code is amalgamated; that is, after making changes to the sources in the `include/nlohmann` directory, run `make amalgamate` to create the single-header file `single_include/nlohmann/json.hpp`. The whole process is described [here](https://github.com/nlohmann/json/blob/develop/.github/CONTRIBUTING.md#files-to-change).
 
 ## Please don't
 
diff --git a/.travis.yml b/.travis.yml
index 6c28475..22a9b67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -291,11 +291,3 @@
   - cmake .. ${CMAKE_OPTIONS} -GNinja && cmake --build . --config Release
   - ctest -C Release -V -j
   - cd ..
-
-  # check if homebrew works (only checks develop branch)
-  - if [ `which brew` ]; then
-    brew update ;
-    brew tap nlohmann/json ;
-    brew install nlohmann_json --HEAD ;
-    brew test nlohmann_json ;
-    fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca4f49a..22408ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 ## PROJECT
 ## name and version
 ##
-project(nlohmann_json VERSION 3.0.1 LANGUAGES CXX)
+project(nlohmann_json VERSION 3.1.0 LANGUAGES CXX)
 
 ##
 ## INCLUDE
diff --git a/ChangeLog.md b/ChangeLog.md
index bb95f93..bc03ba2 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,6 +1,69 @@
 # Change Log
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [v3.1.0](https://github.com/nlohmann/json/releases/tag/v3.1.0) (2018-02-01)
+[Full Changelog](https://github.com/nlohmann/json/compare/v3.0.1...v3.1.0)
+
+- I have a proposal [\#949](https://github.com/nlohmann/json/issues/949)
+- VERSION define\(s\) [\#948](https://github.com/nlohmann/json/issues/948)
+- v3.0.1 compile error in icc 16.0.4 [\#947](https://github.com/nlohmann/json/issues/947)
+- Use in VS2017 15.5.5 [\#946](https://github.com/nlohmann/json/issues/946)
+- Process for reporting Security Bugs? [\#945](https://github.com/nlohmann/json/issues/945)
+- Please expose a NLOHMANN\_JSON\_VERSION macro [\#943](https://github.com/nlohmann/json/issues/943)
+- Change header include directory to nlohmann/json [\#942](https://github.com/nlohmann/json/issues/942)
+- string\_type in binary\_reader [\#941](https://github.com/nlohmann/json/issues/941)
+- compile error with clang 5.0 -std=c++1z and no string\_view [\#939](https://github.com/nlohmann/json/issues/939)
+- Allow overriding JSON\_THROW to something else than abort\(\) [\#938](https://github.com/nlohmann/json/issues/938)
+- Handle invalid string in Json file [\#937](https://github.com/nlohmann/json/issues/937)
+- Unused variable 'kMinExp' [\#935](https://github.com/nlohmann/json/issues/935)
+- test [\#934](https://github.com/nlohmann/json/issues/934)
+- yytext is already defined [\#933](https://github.com/nlohmann/json/issues/933)
+- Equality operator fails [\#931](https://github.com/nlohmann/json/issues/931)
+- use in visual studio 2015 [\#929](https://github.com/nlohmann/json/issues/929)
+- Relative includes of json\_fwd.hpp in detail/meta.hpp. \[Develop branch\] [\#928](https://github.com/nlohmann/json/issues/928)
+- GCC 7.x issue [\#926](https://github.com/nlohmann/json/issues/926)
+- json\_fwd.hpp not installed [\#923](https://github.com/nlohmann/json/issues/923)
+- Use Google Benchmarks [\#921](https://github.com/nlohmann/json/issues/921)
+- Move class json\_pointer to separate file [\#920](https://github.com/nlohmann/json/issues/920)
+- Unable to locate 'to\_json\(\)' and 'from\_json\(\)' methods in the same namespace [\#917](https://github.com/nlohmann/json/issues/917)
+- \[answered\]Read key1 from .value example  [\#914](https://github.com/nlohmann/json/issues/914)
+- Don't use `define private public` in test files [\#913](https://github.com/nlohmann/json/issues/913)
+- value\(\) template argument type deduction [\#912](https://github.com/nlohmann/json/issues/912)
+- Installation path is incorrect [\#910](https://github.com/nlohmann/json/issues/910)
+- H [\#909](https://github.com/nlohmann/json/issues/909)
+- Build failure using clang 5 [\#908](https://github.com/nlohmann/json/issues/908)
+- Amalgate [\#907](https://github.com/nlohmann/json/issues/907)
+- Update documentation and tests wrt. split headers [\#906](https://github.com/nlohmann/json/issues/906)
+- Lib not working on ubuntu 16.04 [\#905](https://github.com/nlohmann/json/issues/905)
+- Problem when writing to file. [\#904](https://github.com/nlohmann/json/issues/904)
+- C2864 error when compiling with VS2015 and VS 2017 [\#903](https://github.com/nlohmann/json/issues/903)
+- \[json.exception.type\_error.304\] cannot use at\(\) with object [\#902](https://github.com/nlohmann/json/issues/902)
+- How do I forward nlohmann::json declaration? [\#899](https://github.com/nlohmann/json/issues/899)
+- How to effectively store binary data? [\#898](https://github.com/nlohmann/json/issues/898)
+- How to get the length of a JSON string without retrieving its std::string? [\#897](https://github.com/nlohmann/json/issues/897)
+- Regression Tests Failure using "ctest" [\#887](https://github.com/nlohmann/json/issues/887)
+- Discuss: add JSON Merge Patch \(RFC 7396\)? [\#877](https://github.com/nlohmann/json/issues/877)
+- Discuss: replace static "iterator\_wrapper" function with "items" member function [\#874](https://github.com/nlohmann/json/issues/874)
+- Make optional user-data available in from\_json [\#864](https://github.com/nlohmann/json/issues/864)
+- Casting to std::string not working in VS2015 [\#861](https://github.com/nlohmann/json/issues/861)
+- Sequential reading of JSON arrays [\#851](https://github.com/nlohmann/json/issues/851)
+- Idea: Handle Multimaps Better [\#816](https://github.com/nlohmann/json/issues/816)
+- Floating point rounding [\#777](https://github.com/nlohmann/json/issues/777)
+- Loss of precision when serializing \<double\> [\#360](https://github.com/nlohmann/json/issues/360)
+
+- Templatize std::string in binary\_reader \#941 [\#950](https://github.com/nlohmann/json/pull/950) ([kaidokert](https://github.com/kaidokert))
+- fix cmake install directory \(for real this time\) [\#944](https://github.com/nlohmann/json/pull/944) ([theodelrieu](https://github.com/theodelrieu))
+- Allow overriding THROW/CATCH/TRY macros with no-exceptions \#938 [\#940](https://github.com/nlohmann/json/pull/940) ([kaidokert](https://github.com/kaidokert))
+- Removed compiler warning about unused variable 'kMinExp' [\#936](https://github.com/nlohmann/json/pull/936) ([zerodefect](https://github.com/zerodefect))
+- Fix a typo in README.md [\#930](https://github.com/nlohmann/json/pull/930) ([Pipeliner](https://github.com/Pipeliner))
+- Howto installation of json\_fwd.hpp \(fixes \#923\) [\#925](https://github.com/nlohmann/json/pull/925) ([zerodefect](https://github.com/zerodefect))
+- fix sfinae on basic\_json UDT constructor [\#919](https://github.com/nlohmann/json/pull/919) ([theodelrieu](https://github.com/theodelrieu))
+- Floating-point formatting [\#915](https://github.com/nlohmann/json/pull/915) ([abolz](https://github.com/abolz))
+- Fix/cmake install [\#911](https://github.com/nlohmann/json/pull/911) ([theodelrieu](https://github.com/theodelrieu))
+- fix link to the documentation of the emplace function [\#900](https://github.com/nlohmann/json/pull/900) ([Dobiasd](https://github.com/Dobiasd))
+- JSON Merge Patch \(RFC 7396\) [\#876](https://github.com/nlohmann/json/pull/876) ([nlohmann](https://github.com/nlohmann))
+- Refactor/split it [\#700](https://github.com/nlohmann/json/pull/700) ([theodelrieu](https://github.com/theodelrieu))
+
 ## [v3.0.1](https://github.com/nlohmann/json/releases/tag/v3.0.1) (2017-12-29)
 [Full Changelog](https://github.com/nlohmann/json/compare/v3.0.0...v3.0.1)
 
@@ -653,7 +716,7 @@
 - Compilation error. [\#273](https://github.com/nlohmann/json/issues/273)
 - dump\(\) performance degradation in v2 [\#272](https://github.com/nlohmann/json/issues/272)
 
-- fixed a tiny typo [\#271](https://github.com/nlohmann/json/pull/271) ([thelostt](https://github.com/thelostt))
+- fixed a tiny typo [\#271](https://github.com/nlohmann/json/pull/271) ([feroldi](https://github.com/feroldi))
 
 ## [v2.0.0](https://github.com/nlohmann/json/releases/tag/v2.0.0) (2016-06-23)
 [Full Changelog](https://github.com/nlohmann/json/compare/v1.1.0...v2.0.0)
diff --git a/LICENSE.MIT b/LICENSE.MIT
index 00599af..8b0f700 100644
--- a/LICENSE.MIT
+++ b/LICENSE.MIT
@@ -1,6 +1,6 @@
 MIT License 
 
-Copyright (c) 2013-2017 Niels Lohmann
+Copyright (c) 2013-2018 Niels Lohmann
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 4f064a4..5f6a9ba 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![Coverage Status](https://img.shields.io/coveralls/nlohmann/json.svg)](https://coveralls.io/r/nlohmann/json)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5550/badge.svg)](https://scan.coverity.com/projects/nlohmann-json)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3732b3327e34358a0e9d1fe9f661f08)](https://www.codacy.com/app/nlohmann/json?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nlohmann/json&amp;utm_campaign=Badge_Grade)
-[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/Op57X0V7fTf2tdwl)
+[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/VHpbaZBOnrZcbn7j)
 [![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](http://nlohmann.github.io/json)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
 [![GitHub Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases)
@@ -40,7 +40,7 @@
 
 - **Intuitive syntax**. In languages such as Python, JSON feels like a first class data type. We used all the operator magic of modern C++ to achieve the same feeling in your code. Check out the [examples below](#examples) and you'll know what I mean.
 
-- **Trivial integration**. Our whole code consists of a single header file [`json.hpp`](https://github.com/nlohmann/json/blob/develop/src/json.hpp). That's it. No library, no subproject, no dependencies, no complex build system. The class is written in vanilla C++11. All in all, everything should require no adjustment of your compiler flags or project settings.
+- **Trivial integration**. Our whole code consists of a single header file [`json.hpp`](https://github.com/nlohmann/json/blob/single_include/nlohmann/json.hpp). That's it. No library, no subproject, no dependencies, no complex build system. The class is written in vanilla C++11. All in all, everything should require no adjustment of your compiler flags or project settings.
 
 - **Serious testing**. Our class is heavily [unit-tested](https://github.com/nlohmann/json/blob/master/test/src/unit.cpp) and covers [100%](https://coveralls.io/r/nlohmann/json) of the code, including all exceptional behavior. Furthermore, we checked with [Valgrind](http://valgrind.org) that there are no memory leaks. To maintain high quality, the project is following the [Core Infrastructure Initiative (CII) best practices](https://bestpractices.coreinfrastructure.org/projects/289).
 
@@ -55,7 +55,7 @@
 
 ## Integration
 
-The single required source, file `json.hpp` is in the `src` directory or [released here](https://github.com/nlohmann/json/releases). All you need to do is add
+The single required source, file `json.hpp` is in the `single_include/nlohmann` directory or [released here](https://github.com/nlohmann/json/releases). All you need to do is add
 
 ```cpp
 #include "json.hpp"
@@ -66,7 +66,7 @@
 
 to the files you want to use JSON objects. That's it. Do not forget to set the necessary switches to enable C++11 (e.g., `-std=c++11` for GCC and Clang).
 
-You can further use file [`develop/json_fwd.hpp`](https://github.com/nlohmann/json/blob/develop/develop/json_fwd.hpp) for forward-declarations. The installation of json_fwd.hpp (as part of cmake's install step), can be achieved by setting `-DJSON_MultipleHeaders=ON`:
+You can further use file [`include/json_fwd.hpp`](https://github.com/nlohmann/json/blob/develop/develop/json_fwd.hpp) for forward-declarations. The installation of json_fwd.hpp (as part of cmake's install step), can be achieved by setting `-DJSON_MultipleHeaders=ON`:
 
 ### Package Managers
 
@@ -908,7 +908,7 @@
 - [duncanwerner](https://github.com/duncanwerner) found a really embarrassing performance regression in the 2.0.0 release.
 - [Damien](https://github.com/dtoma) fixed one of the last conversion warnings.
 - [Thomas Braun](https://github.com/t-b) fixed a warning in a test case.
-- [Théo DELRIEU](https://github.com/theodelrieu) patiently and constructively oversaw the long way toward [iterator-range parsing](https://github.com/nlohmann/json/issues/290). He also implemented the magic behind the serialization/deserialization of user-defined types.
+- [Théo DELRIEU](https://github.com/theodelrieu) patiently and constructively oversaw the long way toward [iterator-range parsing](https://github.com/nlohmann/json/issues/290). He also implemented the magic behind the serialization/deserialization of user-defined types and split the single header file into smaller chunks.
 - [Stefan](https://github.com/5tefan) fixed a minor issue in the documentation.
 - [Vasil Dimov](https://github.com/vasild) fixed the documentation regarding conversions from `std::multiset`.
 - [ChristophJud](https://github.com/ChristophJud) overworked the CMake files to ease project inclusion.
@@ -967,6 +967,8 @@
 - [abolz](https://github.com/abolz) integrated the Grisu2 algorithm for proper floating-point formatting, allowing more roundtrip checks to succeed.
 - [Vadim Evard](https://github.com/Pipeliner) fixed a Markdown issue in the README.
 - [zerodefect](https://github.com/zerodefect) fixed a compiler warning.
+- [Kert](https://github.com/kaidokert) allowed to template the string type in the serialization and added the possibility to override the exceptional behavior.
+- [mark-99](https://github.com/mark-99) helped fixing an ICC error.
 
 Thanks a lot for helping out! Please [let me know](mailto:mail@nlohmann.me) if I forgot someone.
 
@@ -996,7 +998,7 @@
 - [**send_to_wandbox**](https://github.com/nlohmann/json/blob/develop/doc/scripts/send_to_wandbox.py) to send code examples to [Wandbox](http://melpon.org/wandbox)
 - [**Travis**](https://travis-ci.org) for [continuous integration](https://travis-ci.org/nlohmann/json) on Linux and macOS
 - [**Valgrind**](http://valgrind.org) to check for correct memory management
-- [**Wandbox**](http://melpon.org/wandbox) for [online examples](https://wandbox.org/permlink/Op57X0V7fTf2tdwl)
+- [**Wandbox**](http://melpon.org/wandbox) for [online examples](https://wandbox.org/permlink/VHpbaZBOnrZcbn7j)
 
 
 ## Projects using JSON for Modern C++
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
index f614978..c10d44e 100644
--- a/benchmarks/CMakeLists.txt
+++ b/benchmarks/CMakeLists.txt
@@ -12,7 +12,7 @@
 
 # header directories
 include_directories(thirdparty)
-include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${CMAKE_SOURCE_DIR}/../single_include)
 
 # copy test files to build folder
 file(COPY ${CMAKE_SOURCE_DIR}/data DESTINATION .)
diff --git a/benchmarks/src/benchmarks.cpp b/benchmarks/src/benchmarks.cpp
index 6dd470d..bebef60 100644
--- a/benchmarks/src/benchmarks.cpp
+++ b/benchmarks/src/benchmarks.cpp
@@ -1,5 +1,5 @@
 #include "benchmark/benchmark.h"
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #include <fstream>
 
 using json = nlohmann::json;
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 46d3685..1ccbf26 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "JSON for Modern C++"
-PROJECT_NUMBER         = 3.0.1
+PROJECT_NUMBER         = 3.1.0
 PROJECT_BRIEF          =
 PROJECT_LOGO           =
 OUTPUT_DIRECTORY       = .
@@ -29,7 +29,7 @@
 SEPARATE_MEMBER_PAGES  = YES
 TAB_SIZE               = 4
 ALIASES                = "complexity=@par Complexity^^" \
-                         "liveexample{2}=@par Example^^ \1 ^^ @includelineno \2.cpp \n Output (play with this example @htmlinclude \2.link):^^ @verbinclude \2.output ^^ The <a href= https://github.com/nlohmann/json/blob/develop/doc/examples/\2.cpp>example code</a> above can be translated with @verbatim g++ -std=c++11 -Isrc doc/examples/\2.cpp -o \2 @endverbatim" \
+                         "liveexample{2}=@par Example^^ \1 ^^ @includelineno \2.cpp \n Output (play with this example @htmlinclude \2.link):^^ @verbinclude \2.output ^^ The <a href= https://github.com/nlohmann/json/blob/develop/doc/examples/\2.cpp>example code</a> above can be translated with @verbatim g++ -std=c++11 -Isingle_include doc/examples/\2.cpp -o \2 @endverbatim" \
                          "requirement=@par Requirements^^" \
                          "exceptionsafety=@par Exception safety^^" \
                          "iterators=@par Iterator validity^^"
@@ -107,7 +107,7 @@
 #---------------------------------------------------------------------------
 # Configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../src/json.hpp \
+INPUT                  = ../single_include/nlohmann/json.hpp \
                          index.md \
                          faq.md \
                          binary_formats.md
diff --git a/doc/Makefile b/doc/Makefile
index 886378a..30ee748 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,4 +1,4 @@
-SRCDIR = ../src
+SRCDIR = ../single_include
 SED:=$(shell command -v gsed || which sed)
 
 all: doxygen
@@ -28,7 +28,7 @@
 %.link: %.cpp
 	rm -fr tmp
 	mkdir tmp
-	cp $(SRCDIR)/json.hpp tmp
+	cp -r $(SRCDIR)/nlohmann tmp
 	scripts/send_to_wandbox.py tmp $< > $@.tmp
 	/bin/echo -n "<a target=\"_blank\" href=\"`cat $@.tmp`\"><b>online</b></a>" > $@
 	rm -fr tmp $@.tmp
diff --git a/doc/examples/README.cpp b/doc/examples/README.cpp
index 5a8ab38..04b488d 100644
--- a/doc/examples/README.cpp
+++ b/doc/examples/README.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/README.link b/doc/examples/README.link
index 5403e0d..365a883 100644
--- a/doc/examples/README.link
+++ b/doc/examples/README.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/Op57X0V7fTf2tdwl"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/VHpbaZBOnrZcbn7j"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/array.cpp b/doc/examples/array.cpp
index b43be5a..139b5ef 100644
--- a/doc/examples/array.cpp
+++ b/doc/examples/array.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/array.link b/doc/examples/array.link
index cd77ed1..5f02f8c 100644
--- a/doc/examples/array.link
+++ b/doc/examples/array.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/jKwlQd7pFg6UcIN5"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/piWraYhVg2CV3j2H"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/at__object_t_key_type.cpp b/doc/examples/at__object_t_key_type.cpp
index 0430617..202f8a2 100644
--- a/doc/examples/at__object_t_key_type.cpp
+++ b/doc/examples/at__object_t_key_type.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/at__object_t_key_type.link b/doc/examples/at__object_t_key_type.link
index b4d6efc..bac67ae 100644
--- a/doc/examples/at__object_t_key_type.link
+++ b/doc/examples/at__object_t_key_type.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/FR2yYACZpx0k3Rzp"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/wtWzPSQWWiuxldVs"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/at__object_t_key_type_const.cpp b/doc/examples/at__object_t_key_type_const.cpp
index 9aa2ed3..56ce576 100644
--- a/doc/examples/at__object_t_key_type_const.cpp
+++ b/doc/examples/at__object_t_key_type_const.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/at__object_t_key_type_const.link b/doc/examples/at__object_t_key_type_const.link
index 6e6ca33..3000cc5 100644
--- a/doc/examples/at__object_t_key_type_const.link
+++ b/doc/examples/at__object_t_key_type_const.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/aeF8S2D89A8lfVx1"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/Zh3iTnZNxsSgBvm3"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/at__size_type.cpp b/doc/examples/at__size_type.cpp
index 202e44b..65baedd 100644
--- a/doc/examples/at__size_type.cpp
+++ b/doc/examples/at__size_type.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/at__size_type.link b/doc/examples/at__size_type.link
index 5dec375..b06ef70 100644
--- a/doc/examples/at__size_type.link
+++ b/doc/examples/at__size_type.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/GmNdQadc8cWDzYpn"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/MfM8XIuPWMvxxdeb"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/at__size_type_const.cpp b/doc/examples/at__size_type_const.cpp
index 33108ce..faa4cff 100644
--- a/doc/examples/at__size_type_const.cpp
+++ b/doc/examples/at__size_type_const.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/at__size_type_const.link b/doc/examples/at__size_type_const.link
index 7412f09..ba465d3 100644
--- a/doc/examples/at__size_type_const.link
+++ b/doc/examples/at__size_type_const.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/zLkp80JFsKEuPd1t"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/eFEcnFZxfdLGSMhw"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/at_json_pointer.cpp b/doc/examples/at_json_pointer.cpp
index f43b1bc..ed450f7 100644
--- a/doc/examples/at_json_pointer.cpp
+++ b/doc/examples/at_json_pointer.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/at_json_pointer.link b/doc/examples/at_json_pointer.link
index 99ebf01..4bae0ca 100644
--- a/doc/examples/at_json_pointer.link
+++ b/doc/examples/at_json_pointer.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/3RO0naQeY3cWXNAz"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/ST2lraxpPLdDOUFn"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/at_json_pointer_const.cpp b/doc/examples/at_json_pointer_const.cpp
index 8009e95..6f2b2f5 100644
--- a/doc/examples/at_json_pointer_const.cpp
+++ b/doc/examples/at_json_pointer_const.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/at_json_pointer_const.link b/doc/examples/at_json_pointer_const.link
index 9011b99..21e000c 100644
--- a/doc/examples/at_json_pointer_const.link
+++ b/doc/examples/at_json_pointer_const.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/LwtGNqrGgjcWey3P"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/FkPwquIlr9pojvGf"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/back.cpp b/doc/examples/back.cpp
index cb227c2..1439a82 100644
--- a/doc/examples/back.cpp
+++ b/doc/examples/back.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/back.link b/doc/examples/back.link
index fa1ce91..09a85fd 100644
--- a/doc/examples/back.link
+++ b/doc/examples/back.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/VXTfLJQl9x7NaHrI"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/AxHC1Xl6KALWJ0FJ"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/basic_json__CompatibleType.cpp b/doc/examples/basic_json__CompatibleType.cpp
index 6949355..d39fd7a 100644
--- a/doc/examples/basic_json__CompatibleType.cpp
+++ b/doc/examples/basic_json__CompatibleType.cpp
@@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <valarray>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/basic_json__CompatibleType.link b/doc/examples/basic_json__CompatibleType.link
index a6e786a..6f40144 100644
--- a/doc/examples/basic_json__CompatibleType.link
+++ b/doc/examples/basic_json__CompatibleType.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/s7Ecy7hDYSmUWHyx"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/pylFciQUhOx6zXW8"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/basic_json__CompatibleType.output b/doc/examples/basic_json__CompatibleType.output
index cd5923b..2337e81 100644
--- a/doc/examples/basic_json__CompatibleType.output
+++ b/doc/examples/basic_json__CompatibleType.output
@@ -28,10 +28,10 @@
 1024
 -17
 8
-3.14159265358979
+3.141592653589793
 null
 null
-42.2299995422363
+42.22999954223633
 null
 23.42
 
diff --git a/doc/examples/basic_json__InputIt_InputIt.cpp b/doc/examples/basic_json__InputIt_InputIt.cpp
index 36c6f57..ed5aff9 100644
--- a/doc/examples/basic_json__InputIt_InputIt.cpp
+++ b/doc/examples/basic_json__InputIt_InputIt.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/basic_json__InputIt_InputIt.link b/doc/examples/basic_json__InputIt_InputIt.link
index aad58f7..bd8170d 100644
--- a/doc/examples/basic_json__InputIt_InputIt.link
+++ b/doc/examples/basic_json__InputIt_InputIt.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/qpFQRSCnP6iVb3dF"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/KCfRvbW3QTvghlFb"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/basic_json__basic_json.cpp b/doc/examples/basic_json__basic_json.cpp
index 98df610..17136f4 100644
--- a/doc/examples/basic_json__basic_json.cpp
+++ b/doc/examples/basic_json__basic_json.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/basic_json__basic_json.link b/doc/examples/basic_json__basic_json.link
index e894b66..8e44fa7 100644
--- a/doc/examples/basic_json__basic_json.link
+++ b/doc/examples/basic_json__basic_json.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/hRrKgHP2a0zgdxJ1"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/TM0OkdSgEIGBDbrv"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/basic_json__copyassignment.cpp b/doc/examples/basic_json__copyassignment.cpp
index 4f1bc43..2d86574 100644
--- a/doc/examples/basic_json__copyassignment.cpp
+++ b/doc/examples/basic_json__copyassignment.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/basic_json__copyassignment.link b/doc/examples/basic_json__copyassignment.link
index eec9258..b558aa0 100644
--- a/doc/examples/basic_json__copyassignment.link
+++ b/doc/examples/basic_json__copyassignment.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/4p0zccjr9gUI65H2"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/jWDJPXw490IFoVL1"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/basic_json__list_init_t.cpp b/doc/examples/basic_json__list_init_t.cpp
index ba1bce4..78611e1 100644
--- a/doc/examples/basic_json__list_init_t.cpp
+++ b/doc/examples/basic_json__list_init_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/basic_json__list_init_t.link b/doc/examples/basic_json__list_init_t.link
index 75234b6..b92a9fa 100644
--- a/doc/examples/basic_json__list_init_t.link
+++ b/doc/examples/basic_json__list_init_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/XyDVBlGsU1DHpRl9"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/FR2ImEj05R1bqqZ2"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/basic_json__moveconstructor.cpp b/doc/examples/basic_json__moveconstructor.cpp
index 3482725..48b68f6 100644
--- a/doc/examples/basic_json__moveconstructor.cpp
+++ b/doc/examples/basic_json__moveconstructor.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/basic_json__moveconstructor.link b/doc/examples/basic_json__moveconstructor.link
index f904730..c45e09b 100644
--- a/doc/examples/basic_json__moveconstructor.link
+++ b/doc/examples/basic_json__moveconstructor.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/Z1uToOcza9ALJxNU"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/XTHN0lMT9QsmBcBy"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/basic_json__nullptr_t.cpp b/doc/examples/basic_json__nullptr_t.cpp
index 886d5ea..7a43666 100644
--- a/doc/examples/basic_json__nullptr_t.cpp
+++ b/doc/examples/basic_json__nullptr_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/basic_json__nullptr_t.link b/doc/examples/basic_json__nullptr_t.link
index 003110f..30568ef 100644
--- a/doc/examples/basic_json__nullptr_t.link
+++ b/doc/examples/basic_json__nullptr_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/JQUGGZT8qZyQsHRv"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/iCwvXJinCVY7q1vi"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/basic_json__size_type_basic_json.cpp b/doc/examples/basic_json__size_type_basic_json.cpp
index a021edd..9ec7677 100644
--- a/doc/examples/basic_json__size_type_basic_json.cpp
+++ b/doc/examples/basic_json__size_type_basic_json.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/basic_json__size_type_basic_json.link b/doc/examples/basic_json__size_type_basic_json.link
index e48b9fd..2b286dc 100644
--- a/doc/examples/basic_json__size_type_basic_json.link
+++ b/doc/examples/basic_json__size_type_basic_json.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/l4fEe7Un5ctCQNuA"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/BzyeWqt4uTQ2nbfx"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/basic_json__value.cpp b/doc/examples/basic_json__value.cpp
index 42d4aa3..9488d30 100644
--- a/doc/examples/basic_json__value.cpp
+++ b/doc/examples/basic_json__value.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/basic_json__value.link b/doc/examples/basic_json__value.link
index d018278..df2bbdc 100644
--- a/doc/examples/basic_json__value.link
+++ b/doc/examples/basic_json__value.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/BRt1QpTsOBkiVcRC"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/zFWa3Zyot2oM3Z8O"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/basic_json__value_ptr.cpp b/doc/examples/basic_json__value_ptr.cpp
index 4f6f999..f25b773 100644
--- a/doc/examples/basic_json__value_ptr.cpp
+++ b/doc/examples/basic_json__value_ptr.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/basic_json__value_ptr.link b/doc/examples/basic_json__value_ptr.link
index 799f96f..3f39369 100644
--- a/doc/examples/basic_json__value_ptr.link
+++ b/doc/examples/basic_json__value_ptr.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/zTlubIHYOK6EGxnc"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/ECfvMr4m68Mfr192"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/basic_json__value_t.cpp b/doc/examples/basic_json__value_t.cpp
index d52e628..c306731 100644
--- a/doc/examples/basic_json__value_t.cpp
+++ b/doc/examples/basic_json__value_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/basic_json__value_t.link b/doc/examples/basic_json__value_t.link
index a66b1dd..8dc41b2 100644
--- a/doc/examples/basic_json__value_t.link
+++ b/doc/examples/basic_json__value_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/NlKuJEkKDx7IhN9Z"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/LNck7Gktm14bmPy0"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/begin.cpp b/doc/examples/begin.cpp
index ebf97e5..42710d1 100644
--- a/doc/examples/begin.cpp
+++ b/doc/examples/begin.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/begin.link b/doc/examples/begin.link
index 64ac5fb..3875421 100644
--- a/doc/examples/begin.link
+++ b/doc/examples/begin.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/fTnaiB7w2ocgAsw8"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/xKAi3HGAdCU5y2dS"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/cbegin.cpp b/doc/examples/cbegin.cpp
index d12c860..3226fd2 100644
--- a/doc/examples/cbegin.cpp
+++ b/doc/examples/cbegin.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/cbegin.link b/doc/examples/cbegin.link
index fe670f1..547ae48 100644
--- a/doc/examples/cbegin.link
+++ b/doc/examples/cbegin.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/I7blCyINJHBX81JG"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/oKNo3GDUa9cxjgVB"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/cend.cpp b/doc/examples/cend.cpp
index 8d141ac..9d7978d 100644
--- a/doc/examples/cend.cpp
+++ b/doc/examples/cend.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/cend.link b/doc/examples/cend.link
index 3c72642..7b8bcba 100644
--- a/doc/examples/cend.link
+++ b/doc/examples/cend.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/LQmVooyLiQWjqnra"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/mP4cOSG4MtXmXlFw"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/clear.cpp b/doc/examples/clear.cpp
index e892b13..f081e7e 100644
--- a/doc/examples/clear.cpp
+++ b/doc/examples/clear.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/clear.link b/doc/examples/clear.link
index 1123e2f..cad700c 100644
--- a/doc/examples/clear.link
+++ b/doc/examples/clear.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/bJHYVEctvmaszdBj"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/0W6xYpQWS5Kd64CF"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/count.cpp b/doc/examples/count.cpp
index cd030ff..0ea19b6 100644
--- a/doc/examples/count.cpp
+++ b/doc/examples/count.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/count.link b/doc/examples/count.link
index 8466674..9355bd2 100644
--- a/doc/examples/count.link
+++ b/doc/examples/count.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/nAD5pUgjv1DcMhh7"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/4qmbLSA75stzPgtZ"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/crbegin.cpp b/doc/examples/crbegin.cpp
index 6dc4a6f..dc3209c 100644
--- a/doc/examples/crbegin.cpp
+++ b/doc/examples/crbegin.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/crbegin.link b/doc/examples/crbegin.link
index f97dac6..6079e7a 100644
--- a/doc/examples/crbegin.link
+++ b/doc/examples/crbegin.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/3ylcqXCMzsKBSkxZ"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/mcjh1kDXXkzq7TxM"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/crend.cpp b/doc/examples/crend.cpp
index 9a00950..dff2609 100644
--- a/doc/examples/crend.cpp
+++ b/doc/examples/crend.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/crend.link b/doc/examples/crend.link
index 208c7c9..1263fc1 100644
--- a/doc/examples/crend.link
+++ b/doc/examples/crend.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/viOKm4V0ccy238mU"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/6tH3hnp53iVzAQZQ"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/diff.cpp b/doc/examples/diff.cpp
index 274e56b..a29f14d 100644
--- a/doc/examples/diff.cpp
+++ b/doc/examples/diff.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/diff.link b/doc/examples/diff.link
index a02ddbd..dfd1772 100644
--- a/doc/examples/diff.link
+++ b/doc/examples/diff.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/QJlGaO7RqgvibCbR"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/tfI8DuCuZs3VB9VF"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/dump.cpp b/doc/examples/dump.cpp
index 1c48597..4deb64a 100644
--- a/doc/examples/dump.cpp
+++ b/doc/examples/dump.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/dump.link b/doc/examples/dump.link
index 4de7034..c072c0d 100644
--- a/doc/examples/dump.link
+++ b/doc/examples/dump.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/mHH9TibITCYPpLwy"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/uC4kna7QsQ0rAt80"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/emplace.cpp b/doc/examples/emplace.cpp
index 7e80b68..a531491 100644
--- a/doc/examples/emplace.cpp
+++ b/doc/examples/emplace.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/emplace.link b/doc/examples/emplace.link
index 809cc21..36f2ed2 100644
--- a/doc/examples/emplace.link
+++ b/doc/examples/emplace.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/xc7HomW1EFM5PV6n"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/zIQBGY6fKqiMmbvb"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/emplace_back.cpp b/doc/examples/emplace_back.cpp
index 6a50fd2..e979a94 100644
--- a/doc/examples/emplace_back.cpp
+++ b/doc/examples/emplace_back.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/emplace_back.link b/doc/examples/emplace_back.link
index 9397a89..2ea20f3 100644
--- a/doc/examples/emplace_back.link
+++ b/doc/examples/emplace_back.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/2WSVQXWzRVuAg5pV"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/QEbpCnjGIpFWmYbE"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/empty.cpp b/doc/examples/empty.cpp
index 94bc46a..6ef6e40 100644
--- a/doc/examples/empty.cpp
+++ b/doc/examples/empty.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/empty.link b/doc/examples/empty.link
index 90a6590..a182c12 100644
--- a/doc/examples/empty.link
+++ b/doc/examples/empty.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/1fN2q9R8yJ9LCSlm"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/AcEmkGmmmz0dPdHW"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/end.cpp b/doc/examples/end.cpp
index 2984f9e..5a5b6e7 100644
--- a/doc/examples/end.cpp
+++ b/doc/examples/end.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/end.link b/doc/examples/end.link
index 2695e1d..9ef322c 100644
--- a/doc/examples/end.link
+++ b/doc/examples/end.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/akgHtQw6EFosJSDq"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/rSTMI3VXUFtNCWNc"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/erase__IteratorType.cpp b/doc/examples/erase__IteratorType.cpp
index 0ba7e6f..bf5d3dd 100644
--- a/doc/examples/erase__IteratorType.cpp
+++ b/doc/examples/erase__IteratorType.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/erase__IteratorType.link b/doc/examples/erase__IteratorType.link
index 71d4114..67ea55a 100644
--- a/doc/examples/erase__IteratorType.link
+++ b/doc/examples/erase__IteratorType.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/LbNMVYCXawbEelo0"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/nh51Nho7iuAAAPyk"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/erase__IteratorType_IteratorType.cpp b/doc/examples/erase__IteratorType_IteratorType.cpp
index efbf789..7cddac6 100644
--- a/doc/examples/erase__IteratorType_IteratorType.cpp
+++ b/doc/examples/erase__IteratorType_IteratorType.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/erase__IteratorType_IteratorType.link b/doc/examples/erase__IteratorType_IteratorType.link
index 9209f64..0ea2989 100644
--- a/doc/examples/erase__IteratorType_IteratorType.link
+++ b/doc/examples/erase__IteratorType_IteratorType.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/KknUwdprg6lIp5YK"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/xqf45a27zQqgthtB"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/erase__key_type.cpp b/doc/examples/erase__key_type.cpp
index 592aa02..40c7551 100644
--- a/doc/examples/erase__key_type.cpp
+++ b/doc/examples/erase__key_type.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/erase__key_type.link b/doc/examples/erase__key_type.link
index b3ab45e..1d02dd5 100644
--- a/doc/examples/erase__key_type.link
+++ b/doc/examples/erase__key_type.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/IN4AQ9AD1JPDNj9Q"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/lMcaGzTQuWn44ly1"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/erase__size_type.cpp b/doc/examples/erase__size_type.cpp
index 72021ba..b6d7b01 100644
--- a/doc/examples/erase__size_type.cpp
+++ b/doc/examples/erase__size_type.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/erase__size_type.link b/doc/examples/erase__size_type.link
index 33a124c..c3d94bb 100644
--- a/doc/examples/erase__size_type.link
+++ b/doc/examples/erase__size_type.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/xCM0BG9ZV6iEMdgr"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/7fA2QoclBNAGZprY"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/exception.cpp b/doc/examples/exception.cpp
index 13926b2..82696e6 100644
--- a/doc/examples/exception.cpp
+++ b/doc/examples/exception.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/exception.link b/doc/examples/exception.link
index 7043792..ed4cb44 100644
--- a/doc/examples/exception.link
+++ b/doc/examples/exception.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/yHjdsKGTYSRFNzD7"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/9ESgIBWRarZRJvCw"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/find__key_type.cpp b/doc/examples/find__key_type.cpp
index c411ba4..685ba77 100644
--- a/doc/examples/find__key_type.cpp
+++ b/doc/examples/find__key_type.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/find__key_type.link b/doc/examples/find__key_type.link
index 0be7a24..f23abc8 100644
--- a/doc/examples/find__key_type.link
+++ b/doc/examples/find__key_type.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/iu2BpRtjiKeJu2pv"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/AQubfCmv848Q66Zi"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/flatten.cpp b/doc/examples/flatten.cpp
index 908b371..2bd7e9e 100644
--- a/doc/examples/flatten.cpp
+++ b/doc/examples/flatten.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/flatten.link b/doc/examples/flatten.link
index d32588f..8eb81a6 100644
--- a/doc/examples/flatten.link
+++ b/doc/examples/flatten.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/EBqdb2uhXyKTbr9f"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/E1HQedkl1zo48WW5"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/from_cbor.cpp b/doc/examples/from_cbor.cpp
index b37b375..633b3e7 100644
--- a/doc/examples/from_cbor.cpp
+++ b/doc/examples/from_cbor.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/from_cbor.link b/doc/examples/from_cbor.link
index 6e1f4e2..6e27db9 100644
--- a/doc/examples/from_cbor.link
+++ b/doc/examples/from_cbor.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/NkSIj6G89DXRXX9u"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/mya8dUDcDDVoUlBZ"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/from_msgpack.cpp b/doc/examples/from_msgpack.cpp
index 84c7d1f..8a99b3c 100644
--- a/doc/examples/from_msgpack.cpp
+++ b/doc/examples/from_msgpack.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/from_msgpack.link b/doc/examples/from_msgpack.link
index 493f443..ddfdcb3 100644
--- a/doc/examples/from_msgpack.link
+++ b/doc/examples/from_msgpack.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/DlKRo80ESI428gH8"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/sMmEKxW5MGOgLC7z"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/from_ubjson.cpp b/doc/examples/from_ubjson.cpp
index 2adca3c..b20999f 100644
--- a/doc/examples/from_ubjson.cpp
+++ b/doc/examples/from_ubjson.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/from_ubjson.link b/doc/examples/from_ubjson.link
index 5ff3682..2855f18 100644
--- a/doc/examples/from_ubjson.link
+++ b/doc/examples/from_ubjson.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/sUHQtigs99PkzlID"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/qq29jfETq7nZRrh5"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/front.cpp b/doc/examples/front.cpp
index bbc372e..a0f6306 100644
--- a/doc/examples/front.cpp
+++ b/doc/examples/front.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/front.link b/doc/examples/front.link
index 4f8bcd7..172924f 100644
--- a/doc/examples/front.link
+++ b/doc/examples/front.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/bK69SEGarbCwnqIB"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/5NtCbAfPzCmmPd5S"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/get__PointerType.cpp b/doc/examples/get__PointerType.cpp
index 29f9ad3..2f32ed7 100644
--- a/doc/examples/get__PointerType.cpp
+++ b/doc/examples/get__PointerType.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/get__PointerType.link b/doc/examples/get__PointerType.link
index 73a3fc5..1c67f73 100644
--- a/doc/examples/get__PointerType.link
+++ b/doc/examples/get__PointerType.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/eMrmXhPWD02HJX9x"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/frQdC0nigwUVSZ21"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/get__ValueType_const.cpp b/doc/examples/get__ValueType_const.cpp
index d78a6b2..7a703aa 100644
--- a/doc/examples/get__ValueType_const.cpp
+++ b/doc/examples/get__ValueType_const.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <unordered_map>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/get__ValueType_const.link b/doc/examples/get__ValueType_const.link
index 7bf5e8a..a3de6d6 100644
--- a/doc/examples/get__ValueType_const.link
+++ b/doc/examples/get__ValueType_const.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/jAZwFrdZS3DgPh1n"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/M4EHlf0MaujBQlub"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/get_ptr.cpp b/doc/examples/get_ptr.cpp
index 27deb14..564ce0f 100644
--- a/doc/examples/get_ptr.cpp
+++ b/doc/examples/get_ptr.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/get_ptr.link b/doc/examples/get_ptr.link
index 6c4a068..ab05e4a 100644
--- a/doc/examples/get_ptr.link
+++ b/doc/examples/get_ptr.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/qnJvFdIQATMPuL6R"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/G1pg9ZBD5n15TZli"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/get_ref.cpp b/doc/examples/get_ref.cpp
index 951fea3..ab25946 100644
--- a/doc/examples/get_ref.cpp
+++ b/doc/examples/get_ref.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/get_ref.link b/doc/examples/get_ref.link
index d5bb4cf..d458912 100644
--- a/doc/examples/get_ref.link
+++ b/doc/examples/get_ref.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/BbthopNwIhKgb4Y9"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/eKlCbdm2UdqXs3hS"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/insert.cpp b/doc/examples/insert.cpp
index 913ad09..4ee6098 100644
--- a/doc/examples/insert.cpp
+++ b/doc/examples/insert.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/insert.link b/doc/examples/insert.link
index 803d5c6..564226f 100644
--- a/doc/examples/insert.link
+++ b/doc/examples/insert.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/KrT6PSRUrEC3E6cx"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/2rHTkWYA0OUwkKBQ"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/insert__count.cpp b/doc/examples/insert__count.cpp
index 3c2ac24..ce33b93 100644
--- a/doc/examples/insert__count.cpp
+++ b/doc/examples/insert__count.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/insert__count.link b/doc/examples/insert__count.link
index a76cd8e..100cd36 100644
--- a/doc/examples/insert__count.link
+++ b/doc/examples/insert__count.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/RRGqHw8PbuHfJ2MF"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/fYEXWvuxjViaPZFS"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/insert__ilist.cpp b/doc/examples/insert__ilist.cpp
index 90965b3..a20766a 100644
--- a/doc/examples/insert__ilist.cpp
+++ b/doc/examples/insert__ilist.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/insert__ilist.link b/doc/examples/insert__ilist.link
index 387dce6..36b181d 100644
--- a/doc/examples/insert__ilist.link
+++ b/doc/examples/insert__ilist.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/Fouhqv1pfmWQ8h17"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/Qr8iIvIRnudssTvd"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/insert__range.cpp b/doc/examples/insert__range.cpp
index 5b0aa9e..92fe63b 100644
--- a/doc/examples/insert__range.cpp
+++ b/doc/examples/insert__range.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/insert__range.link b/doc/examples/insert__range.link
index cd8107c..00e83ac 100644
--- a/doc/examples/insert__range.link
+++ b/doc/examples/insert__range.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/EWKlbEm2NczIX0Kt"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/ObU2cC9WrntLk8Zx"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/insert__range_object.cpp b/doc/examples/insert__range_object.cpp
index b811f8a..97373d3 100644
--- a/doc/examples/insert__range_object.cpp
+++ b/doc/examples/insert__range_object.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/insert__range_object.link b/doc/examples/insert__range_object.link
index 7c67093..70d43ee 100644
--- a/doc/examples/insert__range_object.link
+++ b/doc/examples/insert__range_object.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/JewC0qDxdcbAB0oB"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/TlWdaDctHaHnyFBm"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/invalid_iterator.cpp b/doc/examples/invalid_iterator.cpp
index 2d61359..5d3e622 100644
--- a/doc/examples/invalid_iterator.cpp
+++ b/doc/examples/invalid_iterator.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/invalid_iterator.link b/doc/examples/invalid_iterator.link
index 0bb8695..729243d 100644
--- a/doc/examples/invalid_iterator.link
+++ b/doc/examples/invalid_iterator.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/PW9dQWFyNaUxzEVY"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/PF6TEhsiazggimil"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/is_array.cpp b/doc/examples/is_array.cpp
index 1dbbf5d..235dab7 100644
--- a/doc/examples/is_array.cpp
+++ b/doc/examples/is_array.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/is_array.link b/doc/examples/is_array.link
index 7820d33..4232a92 100644
--- a/doc/examples/is_array.link
+++ b/doc/examples/is_array.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/zL2Z6V2oDAYBfsw8"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/EXdpfHah1530TPIE"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/is_boolean.cpp b/doc/examples/is_boolean.cpp
index 485f970..ccc202d 100644
--- a/doc/examples/is_boolean.cpp
+++ b/doc/examples/is_boolean.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/is_boolean.link b/doc/examples/is_boolean.link
index 9b56f6e..19f0b00 100644
--- a/doc/examples/is_boolean.link
+++ b/doc/examples/is_boolean.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/OPxNx0zPQByL6wTD"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/7sniyNPobbQQdBHJ"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/is_discarded.cpp b/doc/examples/is_discarded.cpp
index 0b0435c..782e649 100644
--- a/doc/examples/is_discarded.cpp
+++ b/doc/examples/is_discarded.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/is_discarded.link b/doc/examples/is_discarded.link
index f20d9ce..9ec778f 100644
--- a/doc/examples/is_discarded.link
+++ b/doc/examples/is_discarded.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/QRFjILGEmqFv8UTH"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/hWqzRJtSjY0cSoQV"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/is_null.cpp b/doc/examples/is_null.cpp
index 3043e18..4a63509 100644
--- a/doc/examples/is_null.cpp
+++ b/doc/examples/is_null.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/is_null.link b/doc/examples/is_null.link
index 05b2701..dd1a5aa 100644
--- a/doc/examples/is_null.link
+++ b/doc/examples/is_null.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/28oi4wU44VJlAFuN"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/r0Z6mhqY20XowAPj"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/is_number.cpp b/doc/examples/is_number.cpp
index 08fa138..eb23bd2 100644
--- a/doc/examples/is_number.cpp
+++ b/doc/examples/is_number.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/is_number.link b/doc/examples/is_number.link
index b1e9ad2..43c52b4 100644
--- a/doc/examples/is_number.link
+++ b/doc/examples/is_number.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/8ZDtESuv4axwzLWS"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/e0RMOkVT4QrwhPV9"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/is_number_float.cpp b/doc/examples/is_number_float.cpp
index aeef78e..3435a7e 100644
--- a/doc/examples/is_number_float.cpp
+++ b/doc/examples/is_number_float.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/is_number_float.link b/doc/examples/is_number_float.link
index 1720807..4d8f0ea 100644
--- a/doc/examples/is_number_float.link
+++ b/doc/examples/is_number_float.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/TBMRmOeVMVqAqteQ"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/Thh18DVuOoaiYidD"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/is_number_integer.cpp b/doc/examples/is_number_integer.cpp
index 90bd214..6f6e420 100644
--- a/doc/examples/is_number_integer.cpp
+++ b/doc/examples/is_number_integer.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/is_number_integer.link b/doc/examples/is_number_integer.link
index a35be75..0233e0f 100644
--- a/doc/examples/is_number_integer.link
+++ b/doc/examples/is_number_integer.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/aEbSUBKUmWl7Dtgu"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/wFZSC6RswWXwSncb"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/is_number_unsigned.cpp b/doc/examples/is_number_unsigned.cpp
index 499530c..2ea2673 100644
--- a/doc/examples/is_number_unsigned.cpp
+++ b/doc/examples/is_number_unsigned.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/is_number_unsigned.link b/doc/examples/is_number_unsigned.link
index 0a2ba02..8981763 100644
--- a/doc/examples/is_number_unsigned.link
+++ b/doc/examples/is_number_unsigned.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/YRHsTGmB2C2olbOB"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/ajo1F1VJwoszcD7Y"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/is_object.cpp b/doc/examples/is_object.cpp
index a0c03a7..42cedf8 100644
--- a/doc/examples/is_object.cpp
+++ b/doc/examples/is_object.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/is_object.link b/doc/examples/is_object.link
index 0cf3d4a..5dd305b 100644
--- a/doc/examples/is_object.link
+++ b/doc/examples/is_object.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/zMdF7NYFMr9KBEPv"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/ojKk5AMVK9xF9bmQ"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/is_primitive.cpp b/doc/examples/is_primitive.cpp
index ab329bd..d70c83e 100644
--- a/doc/examples/is_primitive.cpp
+++ b/doc/examples/is_primitive.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/is_primitive.link b/doc/examples/is_primitive.link
index 2a0e91b..ae58b2d 100644
--- a/doc/examples/is_primitive.link
+++ b/doc/examples/is_primitive.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/MnHvWAzSyqxGkMjB"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/B7F0eMkW0EKdZGcC"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/is_string.cpp b/doc/examples/is_string.cpp
index 44cb483..2679cd1 100644
--- a/doc/examples/is_string.cpp
+++ b/doc/examples/is_string.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/is_string.link b/doc/examples/is_string.link
index f3672db..92b05e7 100644
--- a/doc/examples/is_string.link
+++ b/doc/examples/is_string.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/I8BpwtFc2QJ6Z1Vl"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/2Iq9wtaxEvrb5B68"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/is_structured.cpp b/doc/examples/is_structured.cpp
index b7dfc85..33e2bbd 100644
--- a/doc/examples/is_structured.cpp
+++ b/doc/examples/is_structured.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/is_structured.link b/doc/examples/is_structured.link
index 8ea3a75..44e06e9 100644
--- a/doc/examples/is_structured.link
+++ b/doc/examples/is_structured.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/sE3xMx8q6T0EX0qK"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/44jkAs0G7D0XB24j"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/items.cpp b/doc/examples/items.cpp
index b2224d6..9cd2b51 100644
--- a/doc/examples/items.cpp
+++ b/doc/examples/items.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/items.link b/doc/examples/items.link
index 0b74c5b..001c704 100644
--- a/doc/examples/items.link
+++ b/doc/examples/items.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/E7h0HOuw778Ski8S"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/YXV7iJuG093bA51l"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/iterator_wrapper.cpp b/doc/examples/iterator_wrapper.cpp
index 61687a9..7ef5bc5 100644
--- a/doc/examples/iterator_wrapper.cpp
+++ b/doc/examples/iterator_wrapper.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/iterator_wrapper.link b/doc/examples/iterator_wrapper.link
index 0087d9a..434031b 100644
--- a/doc/examples/iterator_wrapper.link
+++ b/doc/examples/iterator_wrapper.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/FYbRVHJSU3rsOSoo"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/mCgTQ3O0Xo8aLHm3"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/json_pointer.cpp b/doc/examples/json_pointer.cpp
index 23e8e84..75b9717 100644
--- a/doc/examples/json_pointer.cpp
+++ b/doc/examples/json_pointer.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/json_pointer.link b/doc/examples/json_pointer.link
index 3ba4355..952bd74 100644
--- a/doc/examples/json_pointer.link
+++ b/doc/examples/json_pointer.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/G3xdluSrBF8Zfybi"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/M2vsuxjVqXdOVMl6"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/json_pointer__to_string.cpp b/doc/examples/json_pointer__to_string.cpp
index 70b7277..da397cd 100644
--- a/doc/examples/json_pointer__to_string.cpp
+++ b/doc/examples/json_pointer__to_string.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/json_pointer__to_string.link b/doc/examples/json_pointer__to_string.link
index b114812..244c481 100644
--- a/doc/examples/json_pointer__to_string.link
+++ b/doc/examples/json_pointer__to_string.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/R67usvQfh9O9kK3u"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/kzmcy5bC8uORRlsJ"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/max_size.cpp b/doc/examples/max_size.cpp
index 8273f86..c2ffc54 100644
--- a/doc/examples/max_size.cpp
+++ b/doc/examples/max_size.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/max_size.link b/doc/examples/max_size.link
index d49f5ea..1212833 100644
--- a/doc/examples/max_size.link
+++ b/doc/examples/max_size.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/Dh9VyEp2fGAbTkUI"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/CqyzD8Dy3kTgaWP3"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/merge_patch.cpp b/doc/examples/merge_patch.cpp
index 77a5f2a..b8804d7 100644
--- a/doc/examples/merge_patch.cpp
+++ b/doc/examples/merge_patch.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #include <iomanip> // for std::setw
 
 using json = nlohmann::json;
diff --git a/doc/examples/merge_patch.link b/doc/examples/merge_patch.link
index 7a6cbba..41aa4ef 100644
--- a/doc/examples/merge_patch.link
+++ b/doc/examples/merge_patch.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/h13IsbffwmMfqsej"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/gvLzHUR637MzpNoD"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/meta.cpp b/doc/examples/meta.cpp
index 9194bea..e800b9b 100644
--- a/doc/examples/meta.cpp
+++ b/doc/examples/meta.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/meta.link b/doc/examples/meta.link
index f1d8c86..4da2b02 100644
--- a/doc/examples/meta.link
+++ b/doc/examples/meta.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/mtnyQGVjmAoHVvaP"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/0zdmfNQCe4TMw0iI"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/meta.output b/doc/examples/meta.output
index 1b3e2aa..0452905 100644
--- a/doc/examples/meta.output
+++ b/doc/examples/meta.output
@@ -10,8 +10,8 @@
     "url": "https://github.com/nlohmann/json",
     "version": {
         "major": 3,
-        "minor": 0,
-        "patch": 1,
-        "string": "3.0.1"
+        "minor": 1,
+        "patch": 0,
+        "string": "3.1.0"
     }
 }
diff --git a/doc/examples/object.cpp b/doc/examples/object.cpp
index 6c11775..733b89b 100644
--- a/doc/examples/object.cpp
+++ b/doc/examples/object.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/object.link b/doc/examples/object.link
index f863833..fbed2f6 100644
--- a/doc/examples/object.link
+++ b/doc/examples/object.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/GJqwS8AKJxq6aIfN"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/ptV2tdIkWz26Tsit"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operator__ValueType.cpp b/doc/examples/operator__ValueType.cpp
index 2def527..66fcf31 100644
--- a/doc/examples/operator__ValueType.cpp
+++ b/doc/examples/operator__ValueType.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <unordered_map>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operator__ValueType.link b/doc/examples/operator__ValueType.link
index 0c32d63..798b8fd 100644
--- a/doc/examples/operator__ValueType.link
+++ b/doc/examples/operator__ValueType.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/PhHYhHJrFVDCwxJz"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/lqHwLR4mu98821JE"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operator__equal.cpp b/doc/examples/operator__equal.cpp
index d541a21..1426f48 100644
--- a/doc/examples/operator__equal.cpp
+++ b/doc/examples/operator__equal.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operator__equal.link b/doc/examples/operator__equal.link
index ae7c25a..6e1cc1c 100644
--- a/doc/examples/operator__equal.link
+++ b/doc/examples/operator__equal.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/aj64YWLRD21qZE18"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/JRqPAJIQzWmHXecc"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operator__equal__nullptr_t.cpp b/doc/examples/operator__equal__nullptr_t.cpp
index b5d0c64..dbb2103 100644
--- a/doc/examples/operator__equal__nullptr_t.cpp
+++ b/doc/examples/operator__equal__nullptr_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operator__equal__nullptr_t.link b/doc/examples/operator__equal__nullptr_t.link
index 90cc174..097da77 100644
--- a/doc/examples/operator__equal__nullptr_t.link
+++ b/doc/examples/operator__equal__nullptr_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/LbrZ2kGw20CIeN6s"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/5KP3inAnXZxvEDm6"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operator__greater.cpp b/doc/examples/operator__greater.cpp
index a5c4f78..c632387 100644
--- a/doc/examples/operator__greater.cpp
+++ b/doc/examples/operator__greater.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operator__greater.link b/doc/examples/operator__greater.link
index 7f08279..3fc848e 100644
--- a/doc/examples/operator__greater.link
+++ b/doc/examples/operator__greater.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/ryX5yGEi0FO6jZz2"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/yiz7oCHVpFHSALB1"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operator__greaterequal.cpp b/doc/examples/operator__greaterequal.cpp
index da014bd..f8659ee 100644
--- a/doc/examples/operator__greaterequal.cpp
+++ b/doc/examples/operator__greaterequal.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operator__greaterequal.link b/doc/examples/operator__greaterequal.link
index 599f5d7..62ce78a 100644
--- a/doc/examples/operator__greaterequal.link
+++ b/doc/examples/operator__greaterequal.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/b0qsMsIDCrNduuZ7"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/yqyDIDXWkMvGgev8"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operator__less.cpp b/doc/examples/operator__less.cpp
index 3865847..64209a2 100644
--- a/doc/examples/operator__less.cpp
+++ b/doc/examples/operator__less.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operator__less.link b/doc/examples/operator__less.link
index 0689f99..52da7af 100644
--- a/doc/examples/operator__less.link
+++ b/doc/examples/operator__less.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/otGM5StP1x4jd5CQ"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/gHXKkTMcewuDPzd8"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operator__lessequal.cpp b/doc/examples/operator__lessequal.cpp
index 8e9a21f..543b954 100644
--- a/doc/examples/operator__lessequal.cpp
+++ b/doc/examples/operator__lessequal.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operator__lessequal.link b/doc/examples/operator__lessequal.link
index 5768185..0c9ede3 100644
--- a/doc/examples/operator__lessequal.link
+++ b/doc/examples/operator__lessequal.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/CRVuBTc86hxTNH4X"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/mj0PA1qNAfx8igKN"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operator__notequal.cpp b/doc/examples/operator__notequal.cpp
index debcdf8..43e8950 100644
--- a/doc/examples/operator__notequal.cpp
+++ b/doc/examples/operator__notequal.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operator__notequal.link b/doc/examples/operator__notequal.link
index c23e826..656ffa8 100644
--- a/doc/examples/operator__notequal.link
+++ b/doc/examples/operator__notequal.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/g6U57ryXVuvgwSUB"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/GAhLhVIxDu4PmD1F"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operator__notequal__nullptr_t.cpp b/doc/examples/operator__notequal__nullptr_t.cpp
index 8d74e71..dc7e6ac 100644
--- a/doc/examples/operator__notequal__nullptr_t.cpp
+++ b/doc/examples/operator__notequal__nullptr_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operator__notequal__nullptr_t.link b/doc/examples/operator__notequal__nullptr_t.link
index 49864d3..f9a1700 100644
--- a/doc/examples/operator__notequal__nullptr_t.link
+++ b/doc/examples/operator__notequal__nullptr_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/ywBPZQjmlieF7sv0"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/KjefUPuhPStN4Dpj"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operator__value_t.cpp b/doc/examples/operator__value_t.cpp
index 087910a..d9aac79 100644
--- a/doc/examples/operator__value_t.cpp
+++ b/doc/examples/operator__value_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operator__value_t.link b/doc/examples/operator__value_t.link
index 7c22cd4..d2c38a3 100644
--- a/doc/examples/operator__value_t.link
+++ b/doc/examples/operator__value_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/aUlH5rQeIA002APo"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/DGNREN3mkIDq1xvs"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operator_deserialize.cpp b/doc/examples/operator_deserialize.cpp
index 7a2cf23..bf21448 100644
--- a/doc/examples/operator_deserialize.cpp
+++ b/doc/examples/operator_deserialize.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operator_deserialize.link b/doc/examples/operator_deserialize.link
index d60e530..72d7350 100644
--- a/doc/examples/operator_deserialize.link
+++ b/doc/examples/operator_deserialize.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/qrMPH8rv4FBqE2Ri"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/YrUqrUFMD7JHwSQR"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operator_serialize.cpp b/doc/examples/operator_serialize.cpp
index 7f55638..0c46f01 100644
--- a/doc/examples/operator_serialize.cpp
+++ b/doc/examples/operator_serialize.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operator_serialize.link b/doc/examples/operator_serialize.link
index f078934..57edc8c 100644
--- a/doc/examples/operator_serialize.link
+++ b/doc/examples/operator_serialize.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/9j30rS3lws0iiHPd"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/wXcm4ObnoaXw7CRt"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operatorarray__key_type.cpp b/doc/examples/operatorarray__key_type.cpp
index 43ff8ad..8db08d0 100644
--- a/doc/examples/operatorarray__key_type.cpp
+++ b/doc/examples/operatorarray__key_type.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operatorarray__key_type.link b/doc/examples/operatorarray__key_type.link
index 68a7a9c..c1a534b 100644
--- a/doc/examples/operatorarray__key_type.link
+++ b/doc/examples/operatorarray__key_type.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/bYLh2weuTo9jkR5V"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/vxt8d8qvYorXS2yq"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operatorarray__key_type_const.cpp b/doc/examples/operatorarray__key_type_const.cpp
index 2320e43..1bdb340 100644
--- a/doc/examples/operatorarray__key_type_const.cpp
+++ b/doc/examples/operatorarray__key_type_const.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operatorarray__key_type_const.link b/doc/examples/operatorarray__key_type_const.link
index 53a0892..9467ca2 100644
--- a/doc/examples/operatorarray__key_type_const.link
+++ b/doc/examples/operatorarray__key_type_const.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/Ee3J5N5Gn6ANooov"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/ASyxBOaT5x8RUt40"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operatorarray__size_type.cpp b/doc/examples/operatorarray__size_type.cpp
index bc8ecb9..d6f3e15 100644
--- a/doc/examples/operatorarray__size_type.cpp
+++ b/doc/examples/operatorarray__size_type.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operatorarray__size_type.link b/doc/examples/operatorarray__size_type.link
index 3e05678..018f0bd 100644
--- a/doc/examples/operatorarray__size_type.link
+++ b/doc/examples/operatorarray__size_type.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/21HxgPDhXEGvFC6C"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/GooJD9aQ3hefM8ur"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operatorarray__size_type_const.cpp b/doc/examples/operatorarray__size_type_const.cpp
index ec9fc30..1bd88bc 100644
--- a/doc/examples/operatorarray__size_type_const.cpp
+++ b/doc/examples/operatorarray__size_type_const.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operatorarray__size_type_const.link b/doc/examples/operatorarray__size_type_const.link
index 2eb1a38..8a9cd0b 100644
--- a/doc/examples/operatorarray__size_type_const.link
+++ b/doc/examples/operatorarray__size_type_const.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/IyS4nyuQg9OS8FaF"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/K8peAfoiWbp1wSqq"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operatorjson_pointer.cpp b/doc/examples/operatorjson_pointer.cpp
index d403667..7a0353a 100644
--- a/doc/examples/operatorjson_pointer.cpp
+++ b/doc/examples/operatorjson_pointer.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operatorjson_pointer.link b/doc/examples/operatorjson_pointer.link
index 92bf9d7..92468d7 100644
--- a/doc/examples/operatorjson_pointer.link
+++ b/doc/examples/operatorjson_pointer.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/r7jZiTjekxAmg70w"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/kSjjpnXKP4bWfuCu"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/operatorjson_pointer_const.cpp b/doc/examples/operatorjson_pointer_const.cpp
index 52b2a9e..a5a437b 100644
--- a/doc/examples/operatorjson_pointer_const.cpp
+++ b/doc/examples/operatorjson_pointer_const.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/operatorjson_pointer_const.link b/doc/examples/operatorjson_pointer_const.link
index 22a7c5c..836e755 100644
--- a/doc/examples/operatorjson_pointer_const.link
+++ b/doc/examples/operatorjson_pointer_const.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/MtaIF9fNY9WPXrUG"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/MZ4SoILiRC8Meuir"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/other_error.cpp b/doc/examples/other_error.cpp
index 16b9657..2e7ccfb 100644
--- a/doc/examples/other_error.cpp
+++ b/doc/examples/other_error.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/other_error.link b/doc/examples/other_error.link
index a8dd89b..bdb1175 100644
--- a/doc/examples/other_error.link
+++ b/doc/examples/other_error.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/UcADWdVMPA9GZbRP"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/pthRR6JAltqIxj0c"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/out_of_range.cpp b/doc/examples/out_of_range.cpp
index adec741..e711640 100644
--- a/doc/examples/out_of_range.cpp
+++ b/doc/examples/out_of_range.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/out_of_range.link b/doc/examples/out_of_range.link
index 3daa44e..790eec6 100644
--- a/doc/examples/out_of_range.link
+++ b/doc/examples/out_of_range.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/VrsKXxX3CuHeqKq7"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/UgWb7k87ABSwTuIp"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/parse__array__parser_callback_t.cpp b/doc/examples/parse__array__parser_callback_t.cpp
index 0857f9a..6083a95 100644
--- a/doc/examples/parse__array__parser_callback_t.cpp
+++ b/doc/examples/parse__array__parser_callback_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/parse__array__parser_callback_t.link b/doc/examples/parse__array__parser_callback_t.link
index 2c4a768..017f9ff 100644
--- a/doc/examples/parse__array__parser_callback_t.link
+++ b/doc/examples/parse__array__parser_callback_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/12CMBHX694yrt0i9"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/TSNxHmegVwLW2pXf"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/parse__contiguouscontainer__parser_callback_t.cpp b/doc/examples/parse__contiguouscontainer__parser_callback_t.cpp
index 29b5481..fe51560 100644
--- a/doc/examples/parse__contiguouscontainer__parser_callback_t.cpp
+++ b/doc/examples/parse__contiguouscontainer__parser_callback_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/parse__contiguouscontainer__parser_callback_t.link b/doc/examples/parse__contiguouscontainer__parser_callback_t.link
index 2e7f62e..2cc9659 100644
--- a/doc/examples/parse__contiguouscontainer__parser_callback_t.link
+++ b/doc/examples/parse__contiguouscontainer__parser_callback_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/YDBQGKfyJUePDpRe"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/l3zNo3YKC2X8yAw9"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/parse__istream__parser_callback_t.cpp b/doc/examples/parse__istream__parser_callback_t.cpp
index a20e81f..92e62d9 100644
--- a/doc/examples/parse__istream__parser_callback_t.cpp
+++ b/doc/examples/parse__istream__parser_callback_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/parse__istream__parser_callback_t.link b/doc/examples/parse__istream__parser_callback_t.link
index 7afa48b..64b703a 100644
--- a/doc/examples/parse__istream__parser_callback_t.link
+++ b/doc/examples/parse__istream__parser_callback_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/DhwTP8AtK5UoeF55"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/Mf7A6JtvqT1Na7Pk"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/parse__iteratortype__parser_callback_t.cpp b/doc/examples/parse__iteratortype__parser_callback_t.cpp
index 6044021..b513fe7 100644
--- a/doc/examples/parse__iteratortype__parser_callback_t.cpp
+++ b/doc/examples/parse__iteratortype__parser_callback_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/parse__iteratortype__parser_callback_t.link b/doc/examples/parse__iteratortype__parser_callback_t.link
index 093a2d1..9adda14 100644
--- a/doc/examples/parse__iteratortype__parser_callback_t.link
+++ b/doc/examples/parse__iteratortype__parser_callback_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/c4K2s7QuFNfXd3j7"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/oa6BVkBXjG8DNkzX"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/parse__string__parser_callback_t.cpp b/doc/examples/parse__string__parser_callback_t.cpp
index 37ea6df..4db82d9 100644
--- a/doc/examples/parse__string__parser_callback_t.cpp
+++ b/doc/examples/parse__string__parser_callback_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/parse__string__parser_callback_t.link b/doc/examples/parse__string__parser_callback_t.link
index 94643bb..8eab4cd 100644
--- a/doc/examples/parse__string__parser_callback_t.link
+++ b/doc/examples/parse__string__parser_callback_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/GKABhikWJQTHeX7z"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/QXdl4yzts3qPeZ0U"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/parse_error.cpp b/doc/examples/parse_error.cpp
index 6802e7d..9b27b58 100644
--- a/doc/examples/parse_error.cpp
+++ b/doc/examples/parse_error.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/parse_error.link b/doc/examples/parse_error.link
index 89a31ea..7e3e864 100644
--- a/doc/examples/parse_error.link
+++ b/doc/examples/parse_error.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/74sQTauZsM8tWyuM"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/mIKYWmi174lpgw4Y"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/patch.cpp b/doc/examples/patch.cpp
index fd0e6bf..a3c64a6 100644
--- a/doc/examples/patch.cpp
+++ b/doc/examples/patch.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/patch.link b/doc/examples/patch.link
index 7038cda..1997062 100644
--- a/doc/examples/patch.link
+++ b/doc/examples/patch.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/QVr68rXTR2kztpbl"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/8ObNa6ejw4BXQ5qG"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/push_back.cpp b/doc/examples/push_back.cpp
index 7b0ec48..bbddf4f 100644
--- a/doc/examples/push_back.cpp
+++ b/doc/examples/push_back.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/push_back.link b/doc/examples/push_back.link
index dc2b525..4ee15bf 100644
--- a/doc/examples/push_back.link
+++ b/doc/examples/push_back.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/nXx2jBB2mfhTui2x"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/0D5Tjq6pbMessqH1"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/push_back__initializer_list.cpp b/doc/examples/push_back__initializer_list.cpp
index d231e71..e96645f 100644
--- a/doc/examples/push_back__initializer_list.cpp
+++ b/doc/examples/push_back__initializer_list.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/push_back__initializer_list.link b/doc/examples/push_back__initializer_list.link
index f6796c2..f18e96f 100644
--- a/doc/examples/push_back__initializer_list.link
+++ b/doc/examples/push_back__initializer_list.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/Pkordpr08QOqwQ5S"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/hV7FtaoGexS23ZH3"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/push_back__object_t__value.cpp b/doc/examples/push_back__object_t__value.cpp
index 27215fb..5d694e9 100644
--- a/doc/examples/push_back__object_t__value.cpp
+++ b/doc/examples/push_back__object_t__value.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/push_back__object_t__value.link b/doc/examples/push_back__object_t__value.link
index 375315e..396fdf2 100644
--- a/doc/examples/push_back__object_t__value.link
+++ b/doc/examples/push_back__object_t__value.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/YMP7YqusA4FVCXd8"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/g2EbqobnylUvWg6N"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/rbegin.cpp b/doc/examples/rbegin.cpp
index 2e9824b..239f7a6 100644
--- a/doc/examples/rbegin.cpp
+++ b/doc/examples/rbegin.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/rbegin.link b/doc/examples/rbegin.link
index 3417421..8c8c924 100644
--- a/doc/examples/rbegin.link
+++ b/doc/examples/rbegin.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/ntIP2dRz12dM8cBi"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/aRWE2hgZjrYjoaIA"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/rend.cpp b/doc/examples/rend.cpp
index 0c81da1..adadbbd 100644
--- a/doc/examples/rend.cpp
+++ b/doc/examples/rend.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/rend.link b/doc/examples/rend.link
index 7c9360b..596faf6 100644
--- a/doc/examples/rend.link
+++ b/doc/examples/rend.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/bwTPFmGISMU3mBoH"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/1MJ045BoWXVxxBbo"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/size.cpp b/doc/examples/size.cpp
index 07d1b6c..2375483 100644
--- a/doc/examples/size.cpp
+++ b/doc/examples/size.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/size.link b/doc/examples/size.link
index 9042e08..7b2f250 100644
--- a/doc/examples/size.link
+++ b/doc/examples/size.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/a0lRgHqcBsG9bezj"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/OTHdGYDUWACNRxGa"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/swap__array_t.cpp b/doc/examples/swap__array_t.cpp
index c83556e..2119dd5 100644
--- a/doc/examples/swap__array_t.cpp
+++ b/doc/examples/swap__array_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/swap__array_t.link b/doc/examples/swap__array_t.link
index 7562e78..53670b8 100644
--- a/doc/examples/swap__array_t.link
+++ b/doc/examples/swap__array_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/vesMGROXLwOW7kTf"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/iIRq63CVDmNauR5t"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/swap__object_t.cpp b/doc/examples/swap__object_t.cpp
index d67801c..301b558 100644
--- a/doc/examples/swap__object_t.cpp
+++ b/doc/examples/swap__object_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/swap__object_t.link b/doc/examples/swap__object_t.link
index cc6a18b..256be86 100644
--- a/doc/examples/swap__object_t.link
+++ b/doc/examples/swap__object_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/PnS7jOq2cgJMwm6w"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/Pc9pXgONFt2rbQ2w"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/swap__reference.cpp b/doc/examples/swap__reference.cpp
index 5223950..34182ad 100644
--- a/doc/examples/swap__reference.cpp
+++ b/doc/examples/swap__reference.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/swap__reference.link b/doc/examples/swap__reference.link
index 8c90676..49207f6 100644
--- a/doc/examples/swap__reference.link
+++ b/doc/examples/swap__reference.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/XO1V5cnmK17G277z"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/03xB3pGzsNZLG2yj"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/swap__reference.output b/doc/examples/swap__reference.output
index f5495bd..96b07b0 100644
--- a/doc/examples/swap__reference.output
+++ b/doc/examples/swap__reference.output
@@ -1,2 +1,2 @@
-j1 = {"e":2.71828182845905,"pi":3.14159265358979}
+j1 = {"e":2.718281828459045,"pi":3.141592653589793}
 j2 = [1,2,3,4,5]
diff --git a/doc/examples/swap__string_t.cpp b/doc/examples/swap__string_t.cpp
index aeea028..b5d5831 100644
--- a/doc/examples/swap__string_t.cpp
+++ b/doc/examples/swap__string_t.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/swap__string_t.link b/doc/examples/swap__string_t.link
index 29c2f9d..b9fd75b 100644
--- a/doc/examples/swap__string_t.link
+++ b/doc/examples/swap__string_t.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/SgGHz0fYGWTCFwCH"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/begjynVcXSupqxM9"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/to_cbor.cpp b/doc/examples/to_cbor.cpp
index 335a320..b4849c1 100644
--- a/doc/examples/to_cbor.cpp
+++ b/doc/examples/to_cbor.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/to_cbor.link b/doc/examples/to_cbor.link
index 9c9f7a8..31f4809 100644
--- a/doc/examples/to_cbor.link
+++ b/doc/examples/to_cbor.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/ze9XofH6xAKtIha1"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/4bQSclXeqjVFYVL3"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/to_msgpack.cpp b/doc/examples/to_msgpack.cpp
index d0fd981..8b18a12 100644
--- a/doc/examples/to_msgpack.cpp
+++ b/doc/examples/to_msgpack.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/to_msgpack.link b/doc/examples/to_msgpack.link
index ad0c6ce..dfc0d33 100644
--- a/doc/examples/to_msgpack.link
+++ b/doc/examples/to_msgpack.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/k8bMpRumLfsA8ylM"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/WvT2Q0r9vlJYyMM8"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/to_ubjson.cpp b/doc/examples/to_ubjson.cpp
index a39bc08..8a25e61 100644
--- a/doc/examples/to_ubjson.cpp
+++ b/doc/examples/to_ubjson.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/to_ubjson.link b/doc/examples/to_ubjson.link
index 919b8b9..add6fe4 100644
--- a/doc/examples/to_ubjson.link
+++ b/doc/examples/to_ubjson.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/ibti7dSDi4xEPtzQ"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/j3HE6cOkCmKbxxAt"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/type.cpp b/doc/examples/type.cpp
index 5979d02..68fba3a 100644
--- a/doc/examples/type.cpp
+++ b/doc/examples/type.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/type.link b/doc/examples/type.link
index a81ee12..e027bd2 100644
--- a/doc/examples/type.link
+++ b/doc/examples/type.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/LqgeAtdIMLSpGzkE"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/x9q5BXAuh6afrka5"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/type_error.cpp b/doc/examples/type_error.cpp
index 6df39f5..d4f18b1 100644
--- a/doc/examples/type_error.cpp
+++ b/doc/examples/type_error.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/type_error.link b/doc/examples/type_error.link
index fc160d0..6907fd7 100644
--- a/doc/examples/type_error.link
+++ b/doc/examples/type_error.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/HVfmgdIq73ztfCHY"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/9Y0YHe0cJihjmgTu"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/type_name.cpp b/doc/examples/type_name.cpp
index dccbd7b..32d3590 100644
--- a/doc/examples/type_name.cpp
+++ b/doc/examples/type_name.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/type_name.link b/doc/examples/type_name.link
index dad7eeb..454da51 100644
--- a/doc/examples/type_name.link
+++ b/doc/examples/type_name.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/UqDa9aT5fHaK6dPQ"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/YT1bGIdktadCPZuS"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/unflatten.cpp b/doc/examples/unflatten.cpp
index cc672b5..5e3d65e 100644
--- a/doc/examples/unflatten.cpp
+++ b/doc/examples/unflatten.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/unflatten.link b/doc/examples/unflatten.link
index 20582c9..d13f171 100644
--- a/doc/examples/unflatten.link
+++ b/doc/examples/unflatten.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/hvj393WgvjIaiUZe"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/U45AGi5nsDtoDf3u"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/update.cpp b/doc/examples/update.cpp
index 4383df7..b77c0fe 100644
--- a/doc/examples/update.cpp
+++ b/doc/examples/update.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/update.link b/doc/examples/update.link
index 46af9cb..5ad367d 100644
--- a/doc/examples/update.link
+++ b/doc/examples/update.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/ZmHD2plm6OAuY6uJ"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/TGvdYyJtstacZxWq"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/examples/update__range.cpp b/doc/examples/update__range.cpp
index 7c56aad..88780fd 100644
--- a/doc/examples/update__range.cpp
+++ b/doc/examples/update__range.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 
 using json = nlohmann::json;
 
diff --git a/doc/examples/update__range.link b/doc/examples/update__range.link
index 1e90f66..d2d85a8 100644
--- a/doc/examples/update__range.link
+++ b/doc/examples/update__range.link
@@ -1 +1 @@
-<a target="_blank" href="https://wandbox.org/permlink/Dg4mswDmYr4e0M4f"><b>online</b></a>
\ No newline at end of file
+<a target="_blank" href="https://wandbox.org/permlink/BMlas6312rkE4cxz"><b>online</b></a>
\ No newline at end of file
diff --git a/doc/index.md b/doc/index.md
index 66ad588..a3024a9 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -299,9 +299,9 @@
   </tr>
 </table>
 
-@copyright Copyright &copy; 2013-2017 Niels Lohmann. The code is licensed under the [MIT License](http://opensource.org/licenses/MIT).
+@copyright Copyright &copy; 2013-2018 Niels Lohmann. The code is licensed under the [MIT License](http://opensource.org/licenses/MIT).
 
 @author [Niels Lohmann](http://nlohmann.me)
 @see https://github.com/nlohmann/json to download the source code
 
-@version 3.0.1
+@version 3.1.0
diff --git a/doc/json.gif b/doc/json.gif
index 2b5b588..608df6a 100644
--- a/doc/json.gif
+++ b/doc/json.gif
Binary files differ
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
index 0ab7d00..8f04f51 100644
--- a/include/nlohmann/json.hpp
+++ b/include/nlohmann/json.hpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
@@ -30,8 +30,8 @@
 #define NLOHMANN_JSON_HPP
 
 #define NLOHMANN_JSON_VERSION_MAJOR 3
-#define NLOHMANN_JSON_VERSION_MINOR 0
-#define NLOHMANN_JSON_VERSION_PATCH 1
+#define NLOHMANN_JSON_VERSION_MINOR 1
+#define NLOHMANN_JSON_VERSION_PATCH 0
 
 #include <algorithm> // all_of, find, for_each
 #include <cassert> // assert
@@ -937,7 +937,7 @@
                     object = nullptr;  // silence warning, see #821
                     if (JSON_UNLIKELY(t == value_t::null))
                     {
-                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.0.1")); // LCOV_EXCL_LINE
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.1.0")); // LCOV_EXCL_LINE
                     }
                     break;
                 }
diff --git a/meson.build b/meson.build
index 2cfc962..cdbaad9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('nlohmann_json', 'cpp')
 
-nlohmann_json_inc = include_directories('src')
+nlohmann_json_inc = include_directories('single_include/nlohmann')
 
 nlohmann_json_dep = declare_dependency(
   include_directories : nlohmann_json_inc
diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
index 6c19d1e..9b38efb 100644
--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
@@ -30,8 +30,8 @@
 #define NLOHMANN_JSON_HPP
 
 #define NLOHMANN_JSON_VERSION_MAJOR 3
-#define NLOHMANN_JSON_VERSION_MINOR 0
-#define NLOHMANN_JSON_VERSION_PATCH 1
+#define NLOHMANN_JSON_VERSION_MINOR 1
+#define NLOHMANN_JSON_VERSION_PATCH 0
 
 #include <algorithm> // all_of, find, for_each
 #include <cassert> // assert
@@ -10515,7 +10515,7 @@
                     object = nullptr;  // silence warning, see #821
                     if (JSON_UNLIKELY(t == value_t::null))
                     {
-                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.0.1")); // LCOV_EXCL_LINE
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.1.0")); // LCOV_EXCL_LINE
                     }
                     break;
                 }
diff --git a/test/src/fuzzer-driver_afl.cpp b/test/src/fuzzer-driver_afl.cpp
index 69fcec7..6a9c288 100644
--- a/test/src/fuzzer-driver_afl.cpp
+++ b/test/src/fuzzer-driver_afl.cpp
@@ -1,7 +1,7 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (fuzz test support)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 This file implements a driver for American Fuzzy Lop (afl-fuzz). It relies on
diff --git a/test/src/fuzzer-parse_cbor.cpp b/test/src/fuzzer-parse_cbor.cpp
index 72978e5..2b00edf 100644
--- a/test/src/fuzzer-parse_cbor.cpp
+++ b/test/src/fuzzer-parse_cbor.cpp
@@ -1,7 +1,7 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (fuzz test support)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 This file implements a parser test suitable for fuzz testing. Given a byte
diff --git a/test/src/fuzzer-parse_json.cpp b/test/src/fuzzer-parse_json.cpp
index 86a8f7f..5b4e0b0 100644
--- a/test/src/fuzzer-parse_json.cpp
+++ b/test/src/fuzzer-parse_json.cpp
@@ -1,7 +1,7 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (fuzz test support)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 This file implements a parser test suitable for fuzz testing. Given a byte
diff --git a/test/src/fuzzer-parse_msgpack.cpp b/test/src/fuzzer-parse_msgpack.cpp
index 03da575..021945c 100644
--- a/test/src/fuzzer-parse_msgpack.cpp
+++ b/test/src/fuzzer-parse_msgpack.cpp
@@ -1,7 +1,7 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (fuzz test support)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 This file implements a parser test suitable for fuzz testing. Given a byte
diff --git a/test/src/fuzzer-parse_ubjson.cpp b/test/src/fuzzer-parse_ubjson.cpp
index 1980f68..1ad0767 100644
--- a/test/src/fuzzer-parse_ubjson.cpp
+++ b/test/src/fuzzer-parse_ubjson.cpp
@@ -1,7 +1,7 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (fuzz test support)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 This file implements a parser test suitable for fuzz testing. Given a byte
diff --git a/test/src/unit-algorithms.cpp b/test/src/unit-algorithms.cpp
index 001f566..a05eb95 100644
--- a/test/src/unit-algorithms.cpp
+++ b/test/src/unit-algorithms.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-allocator.cpp b/test/src/unit-allocator.cpp
index 9fdb41c..75efaad 100644
--- a/test/src/unit-allocator.cpp
+++ b/test/src/unit-allocator.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-capacity.cpp b/test/src/unit-capacity.cpp
index 1c0d573..e1abe70 100644
--- a/test/src/unit-capacity.cpp
+++ b/test/src/unit-capacity.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-cbor.cpp b/test/src/unit-cbor.cpp
index 41b2e15..62accfc 100644
--- a/test/src/unit-cbor.cpp
+++ b/test/src/unit-cbor.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-class_const_iterator.cpp b/test/src/unit-class_const_iterator.cpp
index cf6777e..e5c2390 100644
--- a/test/src/unit-class_const_iterator.cpp
+++ b/test/src/unit-class_const_iterator.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-class_iterator.cpp b/test/src/unit-class_iterator.cpp
index 168988d..2604729 100644
--- a/test/src/unit-class_iterator.cpp
+++ b/test/src/unit-class_iterator.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-class_lexer.cpp b/test/src/unit-class_lexer.cpp
index 4ae7e77..7850fe0 100644
--- a/test/src/unit-class_lexer.cpp
+++ b/test/src/unit-class_lexer.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-class_parser.cpp b/test/src/unit-class_parser.cpp
index ad1a972..0be045b 100644
--- a/test/src/unit-class_parser.cpp
+++ b/test/src/unit-class_parser.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-comparison.cpp b/test/src/unit-comparison.cpp
index 3ca7d55..e591b0b 100644
--- a/test/src/unit-comparison.cpp
+++ b/test/src/unit-comparison.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-concepts.cpp b/test/src/unit-concepts.cpp
index 29be62d..0079d78 100644
--- a/test/src/unit-concepts.cpp
+++ b/test/src/unit-concepts.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-constructor1.cpp b/test/src/unit-constructor1.cpp
index b1aafc3..b4f4e83 100644
--- a/test/src/unit-constructor1.cpp
+++ b/test/src/unit-constructor1.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-constructor2.cpp b/test/src/unit-constructor2.cpp
index 5cb33fa..9d34f56 100644
--- a/test/src/unit-constructor2.cpp
+++ b/test/src/unit-constructor2.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-convenience.cpp b/test/src/unit-convenience.cpp
index fc04d4a..f9e9928 100644
--- a/test/src/unit-convenience.cpp
+++ b/test/src/unit-convenience.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-conversions.cpp b/test/src/unit-conversions.cpp
index 38c3d8d..9944978 100644
--- a/test/src/unit-conversions.cpp
+++ b/test/src/unit-conversions.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-deserialization.cpp b/test/src/unit-deserialization.cpp
index e790f21..f5a61ce 100644
--- a/test/src/unit-deserialization.cpp
+++ b/test/src/unit-deserialization.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-element_access1.cpp b/test/src/unit-element_access1.cpp
index cc9b3ff..f7fd3e8 100644
--- a/test/src/unit-element_access1.cpp
+++ b/test/src/unit-element_access1.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-element_access2.cpp b/test/src/unit-element_access2.cpp
index 4a566b1..852a93c 100644
--- a/test/src/unit-element_access2.cpp
+++ b/test/src/unit-element_access2.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-inspection.cpp b/test/src/unit-inspection.cpp
index b4fdb9a..5facb11 100644
--- a/test/src/unit-inspection.cpp
+++ b/test/src/unit-inspection.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
@@ -316,8 +316,8 @@
     SECTION("round trips")
     {
         for (const auto& s :
-    {"3.141592653589793", "1000000000000000010E5"
-    })
+                {"3.141592653589793", "1000000000000000010E5"
+                })
         {
             json j1 = json::parse(s);
             std::string s1 = j1.dump();
diff --git a/test/src/unit-items.cpp b/test/src/unit-items.cpp
index 9d45520..6866311 100644
--- a/test/src/unit-items.cpp
+++ b/test/src/unit-items.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-iterators1.cpp b/test/src/unit-iterators1.cpp
index ea789fa..a63de5e 100644
--- a/test/src/unit-iterators1.cpp
+++ b/test/src/unit-iterators1.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-iterators2.cpp b/test/src/unit-iterators2.cpp
index b778f04..05509c3 100644
--- a/test/src/unit-iterators2.cpp
+++ b/test/src/unit-iterators2.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-json_patch.cpp b/test/src/unit-json_patch.cpp
index c69b3f0..71dbc45 100644
--- a/test/src/unit-json_patch.cpp
+++ b/test/src/unit-json_patch.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-json_pointer.cpp b/test/src/unit-json_pointer.cpp
index d6b6149..f572e1c 100644
--- a/test/src/unit-json_pointer.cpp
+++ b/test/src/unit-json_pointer.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-merge_patch.cpp b/test/src/unit-merge_patch.cpp
index 8872076..9dd7162 100644
--- a/test/src/unit-merge_patch.cpp
+++ b/test/src/unit-merge_patch.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 2.1.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-meta.cpp b/test/src/unit-meta.cpp
index 63d9aba..4aa3673 100644
--- a/test/src/unit-meta.cpp
+++ b/test/src/unit-meta.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2016 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
@@ -42,10 +42,10 @@
         CHECK(j["url"] == "https://github.com/nlohmann/json");
         CHECK(j["version"] == json(
         {
-            {"string", "3.0.1"},
+            {"string", "3.1.0"},
             {"major", 3},
-            {"minor", 0},
-            {"patch", 1}
+            {"minor", 1},
+            {"patch", 0}
         }));
 
         CHECK(j.find("platform") != j.end());
diff --git a/test/src/unit-modifiers.cpp b/test/src/unit-modifiers.cpp
index 3b31bda..6d8d3a8 100644
--- a/test/src/unit-modifiers.cpp
+++ b/test/src/unit-modifiers.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-msgpack.cpp b/test/src/unit-msgpack.cpp
index 81aa363..f8de13d 100644
--- a/test/src/unit-msgpack.cpp
+++ b/test/src/unit-msgpack.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-noexcept.cpp b/test/src/unit-noexcept.cpp
index 6d0fd35..9a42d0c 100644
--- a/test/src/unit-noexcept.cpp
+++ b/test/src/unit-noexcept.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-pointer_access.cpp b/test/src/unit-pointer_access.cpp
index eec88ed..60520bd 100644
--- a/test/src/unit-pointer_access.cpp
+++ b/test/src/unit-pointer_access.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-readme.cpp b/test/src/unit-readme.cpp
index ade0e0a..dec879e 100644
--- a/test/src/unit-readme.cpp
+++ b/test/src/unit-readme.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-reference_access.cpp b/test/src/unit-reference_access.cpp
index a87a0c5..c9f21f8 100644
--- a/test/src/unit-reference_access.cpp
+++ b/test/src/unit-reference_access.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-regression.cpp b/test/src/unit-regression.cpp
index bcdb4ac..c342853 100644
--- a/test/src/unit-regression.cpp
+++ b/test/src/unit-regression.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-serialization.cpp b/test/src/unit-serialization.cpp
index 2f667f4..f5ad7f7 100644
--- a/test/src/unit-serialization.cpp
+++ b/test/src/unit-serialization.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-testsuites.cpp b/test/src/unit-testsuites.cpp
index bd813aa..b2cbfbc 100644
--- a/test/src/unit-testsuites.cpp
+++ b/test/src/unit-testsuites.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-to_chars.cpp b/test/src/unit-to_chars.cpp
index dffeaed..f7c3136 100644
--- a/test/src/unit-to_chars.cpp
+++ b/test/src/unit-to_chars.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-ubjson.cpp b/test/src/unit-ubjson.cpp
index f049270..175e5ed 100644
--- a/test/src/unit-ubjson.cpp
+++ b/test/src/unit-ubjson.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-udt.cpp b/test/src/unit-udt.cpp
index 4420415..17baf4e 100644
--- a/test/src/unit-udt.cpp
+++ b/test/src/unit-udt.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2016 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit-unicode.cpp b/test/src/unit-unicode.cpp
index 82a2920..0991290 100644
--- a/test/src/unit-unicode.cpp
+++ b/test/src/unit-unicode.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal
diff --git a/test/src/unit.cpp b/test/src/unit.cpp
index 1ad77ce..c3cfa0f 100644
--- a/test/src/unit.cpp
+++ b/test/src/unit.cpp
@@ -1,11 +1,11 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++ (test suite)
-|  |  |__   |  |  | | | |  version 3.0.1
+|  |  |__   |  |  | | | |  version 3.1.0
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-Copyright (c) 2013-2017 Niels Lohmann <http://nlohmann.me>.
+Copyright (c) 2013-2018 Niels Lohmann <http://nlohmann.me>.
 
 Permission is hereby  granted, free of charge, to any  person obtaining a copy
 of this software and associated  documentation files (the "Software"), to deal