diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 8defa258..02426b0c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 <!--
 Before opening an issue, please read the FAQ:
-https://bblanchon.github.io/ArduinoJson/faq/
+http://arduinojson.org/faq/
 
 Please provide all the relevant information:
 * good title
diff --git a/ArduinoJson.h b/ArduinoJson.h
index 896503a6..b5327564 100644
--- a/ArduinoJson.h
+++ b/ArduinoJson.h
@@ -1,8 +1,5 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include "src/ArduinoJson.h"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61113a32..ce60a187 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-# 
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 cmake_minimum_required(VERSION 3.0)
 project(ArduinoJson)
diff --git a/README.md b/README.md
index e354e6e8..aa74c9ef 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ Features
 * Small footprint
 * Header-only library
 * MIT License
+* [Comprehensive documentation](http://arduinojson.org)
 
 Works on
 --------
@@ -58,9 +59,9 @@ double latitude    = root["data"][0];
 double longitude   = root["data"][1];
 ```
 
-[See JsonParserExample.ino](examples/JsonParserExample/JsonParserExample.ino)
+[See JsonParserExample.ino](http://arduinojson.org/example/parser/)
 
-Use [ArduinoJson Assistant](https://bblanchon.github.io/ArduinoJson/assistant/) to compute the buffer size.
+Use [ArduinoJson Assistant](http://arduinojson.org/assistant/) to compute the buffer size.
 
 #### Encoding / Generating
 
@@ -80,17 +81,17 @@ root.printTo(Serial);
 // {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
 ```
 
-[See JsonGeneratorExample.ino](examples/JsonGeneratorExample/JsonGeneratorExample.ino)
+[See JsonGeneratorExample.ino](http://arduinojson.org/example/generator/)
 
-Use [ArduinoJson Assistant](https://bblanchon.github.io/ArduinoJson/assistant/) to compute the buffer size.
+Use [ArduinoJson Assistant](http://arduinojson.org/assistant/) to compute the buffer size.
 
 
 Documentation
 -------------
 
-The documentation is available online in the [ArduinoJson Website](https://bblanchon.github.io/ArduinoJson/).
+The documentation is available online in the [ArduinoJson Website](http://arduinojson.org/).
 
-The [ArduinoJson Assistant](https://bblanchon.github.io/ArduinoJson/assistant/) helps you get started with the library.
+The [ArduinoJson Assistant](http://arduinojson.org/assistant/) helps you get started with the library.
 
 
 Donators
diff --git a/SUPPORT.md b/SUPPORT.md
index 6c6b3c92..7334b2bf 100644
--- a/SUPPORT.md
+++ b/SUPPORT.md
@@ -6,8 +6,8 @@ We'll be very happy to help you, but first please read the following.
 
 ## Before asking for help
 
-1. Read the [FAQ](https://bblanchon.github.io/ArduinoJson/faq/)
-2. Search in the [API Reference](https://bblanchon.github.io/ArduinoJson/api/)
+1. Read the [FAQ](http://arduinojson.org/faq/)
+2. Search in the [API Reference](http://arduinojson.org/api/)
 
 If you did not find the answer, please create a [new issue on GitHub](https://github.com/bblanchon/ArduinoJson/issues/new).
 
diff --git a/examples/JsonGeneratorExample/JsonGeneratorExample.ino b/examples/JsonGeneratorExample/JsonGeneratorExample.ino
index 58306c8c..24aea00d 100644
--- a/examples/JsonGeneratorExample/JsonGeneratorExample.ino
+++ b/examples/JsonGeneratorExample/JsonGeneratorExample.ino
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 
@@ -17,7 +14,7 @@ void setup() {
   //
   // Inside the brackets, 200 is the size of the pool in bytes.
   // If the JSON object is more complex, you need to increase that value.
-  // See https://bblanchon.github.io/ArduinoJson/assistant/
+  // See http://arduinojson.org/assistant/
   StaticJsonBuffer<200> jsonBuffer;
 
   // StaticJsonBuffer allocates memory on the stack, it can be
diff --git a/examples/JsonHttpClient/JsonHttpClient.ino b/examples/JsonHttpClient/JsonHttpClient.ino
index 5edb817f..8e945223 100644
--- a/examples/JsonHttpClient/JsonHttpClient.ino
+++ b/examples/JsonHttpClient/JsonHttpClient.ino
@@ -1,12 +1,9 @@
 // Sample Arduino Json Web Client
 // Downloads and parse http://jsonplaceholder.typicode.com/users/1
 //
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <Ethernet.h>
@@ -135,7 +132,7 @@ bool skipResponseHeaders() {
 // }
 bool readReponseContent(struct UserData* userData) {
   // Compute optimal size of the JSON buffer according to what we need to parse.
-  // See https://bblanchon.github.io/ArduinoJson/assistant/
+  // See http://arduinojson.org/assistant/
   const size_t BUFFER_SIZE =
       JSON_OBJECT_SIZE(8)    // the root object has 8 elements
       + JSON_OBJECT_SIZE(5)  // the "address" object has 5 elements
diff --git a/examples/JsonParserExample/JsonParserExample.ino b/examples/JsonParserExample/JsonParserExample.ino
index d47f589f..7ba96356 100644
--- a/examples/JsonParserExample/JsonParserExample.ino
+++ b/examples/JsonParserExample/JsonParserExample.ino
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 
@@ -17,7 +14,7 @@ void setup() {
   //
   // Inside the brackets, 200 is the size of the pool in bytes,
   // If the JSON object is more complex, you need to increase that value.
-  // See https://bblanchon.github.io/ArduinoJson/assistant/
+  // See http://arduinojson.org/assistant/
   StaticJsonBuffer<200> jsonBuffer;
 
   // StaticJsonBuffer allocates memory on the stack, it can be
diff --git a/examples/JsonServer/JsonServer.ino b/examples/JsonServer/JsonServer.ino
index 555842b8..4aed53ba 100644
--- a/examples/JsonServer/JsonServer.ino
+++ b/examples/JsonServer/JsonServer.ino
@@ -64,7 +64,7 @@ void loop() {
   if (client) {
     bool success = readRequest(client);
     if (success) {
-      // Use https://bblanchon.github.io/ArduinoJson/assistant/ to
+      // Use http://arduinojson.org/assistant/ to
       // compute the right size for the buffer
       StaticJsonBuffer<500> jsonBuffer;
       JsonObject& json = prepareResponse(jsonBuffer);
diff --git a/examples/JsonUdpBeacon/JsonUdpBeacon.ino b/examples/JsonUdpBeacon/JsonUdpBeacon.ino
index b3bd5fc5..920412d8 100644
--- a/examples/JsonUdpBeacon/JsonUdpBeacon.ino
+++ b/examples/JsonUdpBeacon/JsonUdpBeacon.ino
@@ -49,7 +49,7 @@ void setup() {
 void loop() {
   delay(1000);
 
-  // Use https://bblanchon.github.io/ArduinoJson/assistant/ to
+  // Use http://arduinojson.org/assistant/ to
   // compute the right size for the buffer
   StaticJsonBuffer<300> jsonBuffer;
   JsonObject& json = buildJson(jsonBuffer);
diff --git a/examples/ProgmemExample/ProgmemExample.ino b/examples/ProgmemExample/ProgmemExample.ino
index 195b014f..2f74ec51 100644
--- a/examples/ProgmemExample/ProgmemExample.ino
+++ b/examples/ProgmemExample/ProgmemExample.ino
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 
diff --git a/examples/StringExample/StringExample.ino b/examples/StringExample/StringExample.ino
index 50b8db6e..3257c05c 100644
--- a/examples/StringExample/StringExample.ino
+++ b/examples/StringExample/StringExample.ino
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 
diff --git a/library.properties b/library.properties
index 9809a3c0..b7841263 100644
--- a/library.properties
+++ b/library.properties
@@ -5,5 +5,5 @@ maintainer=Benoit Blanchon <blog.benoitblanchon.fr>
 sentence=An efficient and elegant JSON library for Arduino.
 paragraph=Like this project? Please star it on GitHub!
 category=Data Processing
-url=https://bblanchon.github.io/ArduinoJson/
+url=http://arduinojson.org/
 architectures=*
diff --git a/src/ArduinoJson.h b/src/ArduinoJson.h
index c1ec7c02..f447e672 100644
--- a/src/ArduinoJson.h
+++ b/src/ArduinoJson.h
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson.hpp b/src/ArduinoJson.hpp
index 949fa5ca..2798f606 100644
--- a/src/ArduinoJson.hpp
+++ b/src/ArduinoJson.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Configuration.hpp b/src/ArduinoJson/Configuration.hpp
index a1015a6f..69bddcc3 100644
--- a/src/ArduinoJson/Configuration.hpp
+++ b/src/ArduinoJson/Configuration.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/Encoding.hpp b/src/ArduinoJson/Data/Encoding.hpp
index dba785aa..39ea9d65 100644
--- a/src/ArduinoJson/Data/Encoding.hpp
+++ b/src/ArduinoJson/Data/Encoding.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/JsonBufferAllocated.hpp b/src/ArduinoJson/Data/JsonBufferAllocated.hpp
index ff74adc5..e028c150 100644
--- a/src/ArduinoJson/Data/JsonBufferAllocated.hpp
+++ b/src/ArduinoJson/Data/JsonBufferAllocated.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/JsonFloat.hpp b/src/ArduinoJson/Data/JsonFloat.hpp
index a4a8e937..2e8cf9be 100644
--- a/src/ArduinoJson/Data/JsonFloat.hpp
+++ b/src/ArduinoJson/Data/JsonFloat.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/JsonInteger.hpp b/src/ArduinoJson/Data/JsonInteger.hpp
index 574a5e10..f872f820 100644
--- a/src/ArduinoJson/Data/JsonInteger.hpp
+++ b/src/ArduinoJson/Data/JsonInteger.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/JsonVariantAs.hpp b/src/ArduinoJson/Data/JsonVariantAs.hpp
index 3f19fd23..fcae0fef 100644
--- a/src/ArduinoJson/Data/JsonVariantAs.hpp
+++ b/src/ArduinoJson/Data/JsonVariantAs.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/JsonVariantContent.hpp b/src/ArduinoJson/Data/JsonVariantContent.hpp
index b2771629..94c2adab 100644
--- a/src/ArduinoJson/Data/JsonVariantContent.hpp
+++ b/src/ArduinoJson/Data/JsonVariantContent.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/JsonVariantDefault.hpp b/src/ArduinoJson/Data/JsonVariantDefault.hpp
index a59fd46c..9b12ca03 100644
--- a/src/ArduinoJson/Data/JsonVariantDefault.hpp
+++ b/src/ArduinoJson/Data/JsonVariantDefault.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/JsonVariantType.hpp b/src/ArduinoJson/Data/JsonVariantType.hpp
index ba6a2499..49d21fdb 100644
--- a/src/ArduinoJson/Data/JsonVariantType.hpp
+++ b/src/ArduinoJson/Data/JsonVariantType.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/List.hpp b/src/ArduinoJson/Data/List.hpp
index 8a24666e..26d8c58d 100644
--- a/src/ArduinoJson/Data/List.hpp
+++ b/src/ArduinoJson/Data/List.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/ListConstIterator.hpp b/src/ArduinoJson/Data/ListConstIterator.hpp
index bce1bfa5..e0b0752b 100644
--- a/src/ArduinoJson/Data/ListConstIterator.hpp
+++ b/src/ArduinoJson/Data/ListConstIterator.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/ListIterator.hpp b/src/ArduinoJson/Data/ListIterator.hpp
index a491866f..e27e3dc7 100644
--- a/src/ArduinoJson/Data/ListIterator.hpp
+++ b/src/ArduinoJson/Data/ListIterator.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/ListNode.hpp b/src/ArduinoJson/Data/ListNode.hpp
index 712e15e1..b4e90362 100644
--- a/src/ArduinoJson/Data/ListNode.hpp
+++ b/src/ArduinoJson/Data/ListNode.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/NonCopyable.hpp b/src/ArduinoJson/Data/NonCopyable.hpp
index 98ebd8fb..c07b04ce 100644
--- a/src/ArduinoJson/Data/NonCopyable.hpp
+++ b/src/ArduinoJson/Data/NonCopyable.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/ReferenceType.hpp b/src/ArduinoJson/Data/ReferenceType.hpp
index bbc9046b..1f2a861f 100644
--- a/src/ArduinoJson/Data/ReferenceType.hpp
+++ b/src/ArduinoJson/Data/ReferenceType.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Data/ValueSetter.hpp b/src/ArduinoJson/Data/ValueSetter.hpp
index 7eb3ed63..68db56a0 100644
--- a/src/ArduinoJson/Data/ValueSetter.hpp
+++ b/src/ArduinoJson/Data/ValueSetter.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Deserialization/Comments.hpp b/src/ArduinoJson/Deserialization/Comments.hpp
index 9f281da4..3c04be2e 100644
--- a/src/ArduinoJson/Deserialization/Comments.hpp
+++ b/src/ArduinoJson/Deserialization/Comments.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Deserialization/JsonParser.hpp b/src/ArduinoJson/Deserialization/JsonParser.hpp
index 3e605ef2..02c9c201 100644
--- a/src/ArduinoJson/Deserialization/JsonParser.hpp
+++ b/src/ArduinoJson/Deserialization/JsonParser.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Deserialization/JsonParserImpl.hpp b/src/ArduinoJson/Deserialization/JsonParserImpl.hpp
index 1c41bdaa..56f27b5c 100644
--- a/src/ArduinoJson/Deserialization/JsonParserImpl.hpp
+++ b/src/ArduinoJson/Deserialization/JsonParserImpl.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
@@ -20,8 +17,9 @@ inline bool ArduinoJson::Internals::JsonParser<TReader, TWriter>::eat(
 }
 
 template <typename TReader, typename TWriter>
-inline bool ArduinoJson::Internals::JsonParser<
-    TReader, TWriter>::parseAnythingTo(JsonVariant *destination) {
+inline bool
+ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseAnythingTo(
+    JsonVariant *destination) {
   if (_nestingLimit == 0) return false;
   _nestingLimit--;
   bool success = parseAnythingToUnsafe(destination);
@@ -30,8 +28,9 @@ inline bool ArduinoJson::Internals::JsonParser<
 }
 
 template <typename TReader, typename TWriter>
-inline bool ArduinoJson::Internals::JsonParser<
-    TReader, TWriter>::parseAnythingToUnsafe(JsonVariant *destination) {
+inline bool
+ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseAnythingToUnsafe(
+    JsonVariant *destination) {
   skipSpacesAndComments(_reader);
 
   switch (_reader.current()) {
diff --git a/src/ArduinoJson/Deserialization/StringWriter.hpp b/src/ArduinoJson/Deserialization/StringWriter.hpp
index 42ee640d..af1d8021 100644
--- a/src/ArduinoJson/Deserialization/StringWriter.hpp
+++ b/src/ArduinoJson/Deserialization/StringWriter.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/DynamicJsonBuffer.hpp b/src/ArduinoJson/DynamicJsonBuffer.hpp
index 65e744bf..da7fa839 100644
--- a/src/ArduinoJson/DynamicJsonBuffer.hpp
+++ b/src/ArduinoJson/DynamicJsonBuffer.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonArray.hpp b/src/ArduinoJson/JsonArray.hpp
index 27404fb7..7906b97d 100644
--- a/src/ArduinoJson/JsonArray.hpp
+++ b/src/ArduinoJson/JsonArray.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonArrayImpl.hpp b/src/ArduinoJson/JsonArrayImpl.hpp
index 6ebd39ba..fe590211 100644
--- a/src/ArduinoJson/JsonArrayImpl.hpp
+++ b/src/ArduinoJson/JsonArrayImpl.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonArraySubscript.hpp b/src/ArduinoJson/JsonArraySubscript.hpp
index 5bd6208a..b156602b 100644
--- a/src/ArduinoJson/JsonArraySubscript.hpp
+++ b/src/ArduinoJson/JsonArraySubscript.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonBuffer.hpp b/src/ArduinoJson/JsonBuffer.hpp
index 06bda0ef..79f31f0b 100644
--- a/src/ArduinoJson/JsonBuffer.hpp
+++ b/src/ArduinoJson/JsonBuffer.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonBufferBase.hpp b/src/ArduinoJson/JsonBufferBase.hpp
index 480cd830..051444d7 100644
--- a/src/ArduinoJson/JsonBufferBase.hpp
+++ b/src/ArduinoJson/JsonBufferBase.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonBufferImpl.hpp b/src/ArduinoJson/JsonBufferImpl.hpp
index 98d5de59..4746aec0 100644
--- a/src/ArduinoJson/JsonBufferImpl.hpp
+++ b/src/ArduinoJson/JsonBufferImpl.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonObject.hpp b/src/ArduinoJson/JsonObject.hpp
index a3e30ab2..2209c9bc 100644
--- a/src/ArduinoJson/JsonObject.hpp
+++ b/src/ArduinoJson/JsonObject.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
@@ -45,8 +42,8 @@ class JsonObject : public Internals::JsonPrintable<JsonObject>,
   // Create an empty JsonArray attached to the specified JsonBuffer.
   // You should not use this constructor directly.
   // Instead, use JsonBuffer::createObject() or JsonBuffer.parseObject().
-  explicit JsonObject(JsonBuffer* buffer) throw() 
-    : Internals::List<JsonPair>(buffer) {}
+  explicit JsonObject(JsonBuffer* buffer) throw()
+      : Internals::List<JsonPair>(buffer) {}
 
   // Gets or sets the value associated with the specified key.
   //
diff --git a/src/ArduinoJson/JsonObjectImpl.hpp b/src/ArduinoJson/JsonObjectImpl.hpp
index 9741bfad..313df453 100644
--- a/src/ArduinoJson/JsonObjectImpl.hpp
+++ b/src/ArduinoJson/JsonObjectImpl.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonObjectSubscript.hpp b/src/ArduinoJson/JsonObjectSubscript.hpp
index 99dfe7cd..393473a5 100644
--- a/src/ArduinoJson/JsonObjectSubscript.hpp
+++ b/src/ArduinoJson/JsonObjectSubscript.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonPair.hpp b/src/ArduinoJson/JsonPair.hpp
index 5a32601c..0030955d 100644
--- a/src/ArduinoJson/JsonPair.hpp
+++ b/src/ArduinoJson/JsonPair.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonVariant.hpp b/src/ArduinoJson/JsonVariant.hpp
index 9037d54d..8162dc67 100644
--- a/src/ArduinoJson/JsonVariant.hpp
+++ b/src/ArduinoJson/JsonVariant.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonVariantBase.hpp b/src/ArduinoJson/JsonVariantBase.hpp
index a010e253..2e2a67e1 100644
--- a/src/ArduinoJson/JsonVariantBase.hpp
+++ b/src/ArduinoJson/JsonVariantBase.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonVariantCasts.hpp b/src/ArduinoJson/JsonVariantCasts.hpp
index b3b41b4b..5f6377f0 100644
--- a/src/ArduinoJson/JsonVariantCasts.hpp
+++ b/src/ArduinoJson/JsonVariantCasts.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonVariantComparisons.hpp b/src/ArduinoJson/JsonVariantComparisons.hpp
index eb0ef5c2..049e9568 100644
--- a/src/ArduinoJson/JsonVariantComparisons.hpp
+++ b/src/ArduinoJson/JsonVariantComparisons.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonVariantImpl.hpp b/src/ArduinoJson/JsonVariantImpl.hpp
index eb6a4735..b84ee1a6 100644
--- a/src/ArduinoJson/JsonVariantImpl.hpp
+++ b/src/ArduinoJson/JsonVariantImpl.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/JsonVariantSubscripts.hpp b/src/ArduinoJson/JsonVariantSubscripts.hpp
index 2143236a..86f7a569 100644
--- a/src/ArduinoJson/JsonVariantSubscripts.hpp
+++ b/src/ArduinoJson/JsonVariantSubscripts.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Polyfills/attributes.hpp b/src/ArduinoJson/Polyfills/attributes.hpp
index e4f9406a..9f0e03a4 100644
--- a/src/ArduinoJson/Polyfills/attributes.hpp
+++ b/src/ArduinoJson/Polyfills/attributes.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Polyfills/ctype.hpp b/src/ArduinoJson/Polyfills/ctype.hpp
index f13e3edf..a306357a 100644
--- a/src/ArduinoJson/Polyfills/ctype.hpp
+++ b/src/ArduinoJson/Polyfills/ctype.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Polyfills/isFloat.hpp b/src/ArduinoJson/Polyfills/isFloat.hpp
index f6b9c97d..a9019b10 100644
--- a/src/ArduinoJson/Polyfills/isFloat.hpp
+++ b/src/ArduinoJson/Polyfills/isFloat.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Polyfills/isInteger.hpp b/src/ArduinoJson/Polyfills/isInteger.hpp
index ea39f2a6..3d9b0f4e 100644
--- a/src/ArduinoJson/Polyfills/isInteger.hpp
+++ b/src/ArduinoJson/Polyfills/isInteger.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Polyfills/math.hpp b/src/ArduinoJson/Polyfills/math.hpp
index 9dbd161d..aec12d5e 100644
--- a/src/ArduinoJson/Polyfills/math.hpp
+++ b/src/ArduinoJson/Polyfills/math.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Polyfills/parseFloat.hpp b/src/ArduinoJson/Polyfills/parseFloat.hpp
index e5d99f1b..c3792dcb 100644
--- a/src/ArduinoJson/Polyfills/parseFloat.hpp
+++ b/src/ArduinoJson/Polyfills/parseFloat.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Polyfills/parseInteger.hpp b/src/ArduinoJson/Polyfills/parseInteger.hpp
index 023d7bcb..bcab87a4 100644
--- a/src/ArduinoJson/Polyfills/parseInteger.hpp
+++ b/src/ArduinoJson/Polyfills/parseInteger.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/RawJson.hpp b/src/ArduinoJson/RawJson.hpp
index 6db195c3..c02f2a00 100644
--- a/src/ArduinoJson/RawJson.hpp
+++ b/src/ArduinoJson/RawJson.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Serialization/DummyPrint.hpp b/src/ArduinoJson/Serialization/DummyPrint.hpp
index 656aa9ed..209db9b9 100644
--- a/src/ArduinoJson/Serialization/DummyPrint.hpp
+++ b/src/ArduinoJson/Serialization/DummyPrint.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Serialization/DynamicStringBuilder.hpp b/src/ArduinoJson/Serialization/DynamicStringBuilder.hpp
index a344588d..5cf956f7 100644
--- a/src/ArduinoJson/Serialization/DynamicStringBuilder.hpp
+++ b/src/ArduinoJson/Serialization/DynamicStringBuilder.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Serialization/FloatParts.hpp b/src/ArduinoJson/Serialization/FloatParts.hpp
index fa650723..3a417439 100644
--- a/src/ArduinoJson/Serialization/FloatParts.hpp
+++ b/src/ArduinoJson/Serialization/FloatParts.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Serialization/IndentedPrint.hpp b/src/ArduinoJson/Serialization/IndentedPrint.hpp
index 66ca6ac2..fea59788 100644
--- a/src/ArduinoJson/Serialization/IndentedPrint.hpp
+++ b/src/ArduinoJson/Serialization/IndentedPrint.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Serialization/JsonPrintable.hpp b/src/ArduinoJson/Serialization/JsonPrintable.hpp
index f33e5584..d427dd75 100644
--- a/src/ArduinoJson/Serialization/JsonPrintable.hpp
+++ b/src/ArduinoJson/Serialization/JsonPrintable.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Serialization/JsonSerializer.hpp b/src/ArduinoJson/Serialization/JsonSerializer.hpp
index 86ed73ee..3aacbdf2 100644
--- a/src/ArduinoJson/Serialization/JsonSerializer.hpp
+++ b/src/ArduinoJson/Serialization/JsonSerializer.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Serialization/JsonSerializerImpl.hpp b/src/ArduinoJson/Serialization/JsonSerializerImpl.hpp
index f544488a..3c3560dc 100644
--- a/src/ArduinoJson/Serialization/JsonSerializerImpl.hpp
+++ b/src/ArduinoJson/Serialization/JsonSerializerImpl.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Serialization/JsonWriter.hpp b/src/ArduinoJson/Serialization/JsonWriter.hpp
index 2d54a2a0..055aab66 100644
--- a/src/ArduinoJson/Serialization/JsonWriter.hpp
+++ b/src/ArduinoJson/Serialization/JsonWriter.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Serialization/Prettyfier.hpp b/src/ArduinoJson/Serialization/Prettyfier.hpp
index 377138b4..6f3ee74b 100644
--- a/src/ArduinoJson/Serialization/Prettyfier.hpp
+++ b/src/ArduinoJson/Serialization/Prettyfier.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Serialization/StaticStringBuilder.hpp b/src/ArduinoJson/Serialization/StaticStringBuilder.hpp
index 2df932fd..722574a3 100644
--- a/src/ArduinoJson/Serialization/StaticStringBuilder.hpp
+++ b/src/ArduinoJson/Serialization/StaticStringBuilder.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/Serialization/StreamPrintAdapter.hpp b/src/ArduinoJson/Serialization/StreamPrintAdapter.hpp
index 9c2f86fd..6ae21632 100644
--- a/src/ArduinoJson/Serialization/StreamPrintAdapter.hpp
+++ b/src/ArduinoJson/Serialization/StreamPrintAdapter.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/StaticJsonBuffer.hpp b/src/ArduinoJson/StaticJsonBuffer.hpp
index 8eaa4bb5..70123f2e 100644
--- a/src/ArduinoJson/StaticJsonBuffer.hpp
+++ b/src/ArduinoJson/StaticJsonBuffer.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/StringTraits/ArduinoStream.hpp b/src/ArduinoJson/StringTraits/ArduinoStream.hpp
index 87d1672d..3a9eb65e 100644
--- a/src/ArduinoJson/StringTraits/ArduinoStream.hpp
+++ b/src/ArduinoJson/StringTraits/ArduinoStream.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/StringTraits/CharPointer.hpp b/src/ArduinoJson/StringTraits/CharPointer.hpp
index 203e3924..c2519665 100644
--- a/src/ArduinoJson/StringTraits/CharPointer.hpp
+++ b/src/ArduinoJson/StringTraits/CharPointer.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/StringTraits/FlashString.hpp b/src/ArduinoJson/StringTraits/FlashString.hpp
index 37e36b8d..dd668d10 100644
--- a/src/ArduinoJson/StringTraits/FlashString.hpp
+++ b/src/ArduinoJson/StringTraits/FlashString.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/StringTraits/StdStream.hpp b/src/ArduinoJson/StringTraits/StdStream.hpp
index 35049d94..322720dc 100644
--- a/src/ArduinoJson/StringTraits/StdStream.hpp
+++ b/src/ArduinoJson/StringTraits/StdStream.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/StringTraits/StdString.hpp b/src/ArduinoJson/StringTraits/StdString.hpp
index 959c4746..108704f2 100644
--- a/src/ArduinoJson/StringTraits/StdString.hpp
+++ b/src/ArduinoJson/StringTraits/StdString.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/StringTraits/StringTraits.hpp b/src/ArduinoJson/StringTraits/StringTraits.hpp
index 55bacca2..75d933c5 100644
--- a/src/ArduinoJson/StringTraits/StringTraits.hpp
+++ b/src/ArduinoJson/StringTraits/StringTraits.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/EnableIf.hpp b/src/ArduinoJson/TypeTraits/EnableIf.hpp
index 654b308e..6c7f0b16 100644
--- a/src/ArduinoJson/TypeTraits/EnableIf.hpp
+++ b/src/ArduinoJson/TypeTraits/EnableIf.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/FloatTraits.hpp b/src/ArduinoJson/TypeTraits/FloatTraits.hpp
index a52e1e87..5d89fa3a 100644
--- a/src/ArduinoJson/TypeTraits/FloatTraits.hpp
+++ b/src/ArduinoJson/TypeTraits/FloatTraits.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/IsArray.hpp b/src/ArduinoJson/TypeTraits/IsArray.hpp
index 713808ae..62ffbca9 100644
--- a/src/ArduinoJson/TypeTraits/IsArray.hpp
+++ b/src/ArduinoJson/TypeTraits/IsArray.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/IsBaseOf.hpp b/src/ArduinoJson/TypeTraits/IsBaseOf.hpp
index 9e68debc..36d74136 100644
--- a/src/ArduinoJson/TypeTraits/IsBaseOf.hpp
+++ b/src/ArduinoJson/TypeTraits/IsBaseOf.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/IsChar.hpp b/src/ArduinoJson/TypeTraits/IsChar.hpp
index bd1b5fdd..d616507f 100644
--- a/src/ArduinoJson/TypeTraits/IsChar.hpp
+++ b/src/ArduinoJson/TypeTraits/IsChar.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/IsConst.hpp b/src/ArduinoJson/TypeTraits/IsConst.hpp
index 7ffed844..9e0e8c6d 100644
--- a/src/ArduinoJson/TypeTraits/IsConst.hpp
+++ b/src/ArduinoJson/TypeTraits/IsConst.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/IsFloatingPoint.hpp b/src/ArduinoJson/TypeTraits/IsFloatingPoint.hpp
index c04ce2a6..f0c22a01 100644
--- a/src/ArduinoJson/TypeTraits/IsFloatingPoint.hpp
+++ b/src/ArduinoJson/TypeTraits/IsFloatingPoint.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/IsIntegral.hpp b/src/ArduinoJson/TypeTraits/IsIntegral.hpp
index e34add52..5d89ff7f 100644
--- a/src/ArduinoJson/TypeTraits/IsIntegral.hpp
+++ b/src/ArduinoJson/TypeTraits/IsIntegral.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/IsSame.hpp b/src/ArduinoJson/TypeTraits/IsSame.hpp
index d96a5b55..14a74297 100644
--- a/src/ArduinoJson/TypeTraits/IsSame.hpp
+++ b/src/ArduinoJson/TypeTraits/IsSame.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/IsSignedIntegral.hpp b/src/ArduinoJson/TypeTraits/IsSignedIntegral.hpp
index fde6e13b..2b52a36b 100644
--- a/src/ArduinoJson/TypeTraits/IsSignedIntegral.hpp
+++ b/src/ArduinoJson/TypeTraits/IsSignedIntegral.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp b/src/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp
index 173763e0..aa7f10f9 100644
--- a/src/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp
+++ b/src/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/IsVariant.hpp b/src/ArduinoJson/TypeTraits/IsVariant.hpp
index 8297cf5c..1050c374 100644
--- a/src/ArduinoJson/TypeTraits/IsVariant.hpp
+++ b/src/ArduinoJson/TypeTraits/IsVariant.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/RemoveConst.hpp b/src/ArduinoJson/TypeTraits/RemoveConst.hpp
index 0186234e..5c8ae69c 100644
--- a/src/ArduinoJson/TypeTraits/RemoveConst.hpp
+++ b/src/ArduinoJson/TypeTraits/RemoveConst.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/src/ArduinoJson/TypeTraits/RemoveReference.hpp b/src/ArduinoJson/TypeTraits/RemoveReference.hpp
index 4968997e..3f05125c 100644
--- a/src/ArduinoJson/TypeTraits/RemoveReference.hpp
+++ b/src/ArduinoJson/TypeTraits/RemoveReference.hpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #pragma once
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 39f78c57..bdc6a7eb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-#
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
 	add_compile_options(
diff --git a/test/DynamicJsonBuffer/CMakeLists.txt b/test/DynamicJsonBuffer/CMakeLists.txt
index 665fc82b..358e33b5 100644
--- a/test/DynamicJsonBuffer/CMakeLists.txt
+++ b/test/DynamicJsonBuffer/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-# 
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 add_executable(DynamicJsonBufferTests 
 	alloc.cpp
diff --git a/test/DynamicJsonBuffer/alloc.cpp b/test/DynamicJsonBuffer/alloc.cpp
index 091fc786..2e5ea04e 100644
--- a/test/DynamicJsonBuffer/alloc.cpp
+++ b/test/DynamicJsonBuffer/alloc.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/DynamicJsonBuffer/createArray.cpp b/test/DynamicJsonBuffer/createArray.cpp
index 522d9ac4..1ddb60c3 100644
--- a/test/DynamicJsonBuffer/createArray.cpp
+++ b/test/DynamicJsonBuffer/createArray.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/DynamicJsonBuffer/createObject.cpp b/test/DynamicJsonBuffer/createObject.cpp
index 0bab3770..713c0f6c 100644
--- a/test/DynamicJsonBuffer/createObject.cpp
+++ b/test/DynamicJsonBuffer/createObject.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/DynamicJsonBuffer/no_memory.cpp b/test/DynamicJsonBuffer/no_memory.cpp
index b78bc03f..3c84d585 100644
--- a/test/DynamicJsonBuffer/no_memory.cpp
+++ b/test/DynamicJsonBuffer/no_memory.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/DynamicJsonBuffer/size.cpp b/test/DynamicJsonBuffer/size.cpp
index f9952f51..76e10349 100644
--- a/test/DynamicJsonBuffer/size.cpp
+++ b/test/DynamicJsonBuffer/size.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/DynamicJsonBuffer/startString.cpp b/test/DynamicJsonBuffer/startString.cpp
index 63886217..8bc9b5a1 100644
--- a/test/DynamicJsonBuffer/startString.cpp
+++ b/test/DynamicJsonBuffer/startString.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/DynamicJsonBuffer/strdup.cpp b/test/DynamicJsonBuffer/strdup.cpp
index 371e1c7b..f5158795 100644
--- a/test/DynamicJsonBuffer/strdup.cpp
+++ b/test/DynamicJsonBuffer/strdup.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/IntegrationTests/CMakeLists.txt b/test/IntegrationTests/CMakeLists.txt
index 16e42897..266bfa8b 100644
--- a/test/IntegrationTests/CMakeLists.txt
+++ b/test/IntegrationTests/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-# 
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 add_executable(IntegrationTests 
 	gbathree.cpp
diff --git a/test/IntegrationTests/gbathree.cpp b/test/IntegrationTests/gbathree.cpp
index f8170a07..f4c5a9bc 100644
--- a/test/IntegrationTests/gbathree.cpp
+++ b/test/IntegrationTests/gbathree.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/IntegrationTests/round_trip.cpp b/test/IntegrationTests/round_trip.cpp
index 828115b8..1a1f8b9e 100644
--- a/test/IntegrationTests/round_trip.cpp
+++ b/test/IntegrationTests/round_trip.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonArray/CMakeLists.txt b/test/JsonArray/CMakeLists.txt
index fa3d6e83..82f568d4 100644
--- a/test/JsonArray/CMakeLists.txt
+++ b/test/JsonArray/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-# 
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 add_executable(JsonArrayTests 
 	add.cpp
diff --git a/test/JsonArray/add.cpp b/test/JsonArray/add.cpp
index e844bc2b..384675f9 100644
--- a/test/JsonArray/add.cpp
+++ b/test/JsonArray/add.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonArray/basics.cpp b/test/JsonArray/basics.cpp
index 98e55571..b12a5e25 100644
--- a/test/JsonArray/basics.cpp
+++ b/test/JsonArray/basics.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonArray/copyFrom.cpp b/test/JsonArray/copyFrom.cpp
index d56ef214..892ae17c 100644
--- a/test/JsonArray/copyFrom.cpp
+++ b/test/JsonArray/copyFrom.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonArray/copyTo.cpp b/test/JsonArray/copyTo.cpp
index 866c3db0..90d8380b 100644
--- a/test/JsonArray/copyTo.cpp
+++ b/test/JsonArray/copyTo.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonArray/invalid.cpp b/test/JsonArray/invalid.cpp
index 2e2d04d4..470e682d 100644
--- a/test/JsonArray/invalid.cpp
+++ b/test/JsonArray/invalid.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonArray/iterator.cpp b/test/JsonArray/iterator.cpp
index 3dfbcc2b..e9f00128 100644
--- a/test/JsonArray/iterator.cpp
+++ b/test/JsonArray/iterator.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonArray/prettyPrintTo.cpp b/test/JsonArray/prettyPrintTo.cpp
index 61d58516..078b23df 100644
--- a/test/JsonArray/prettyPrintTo.cpp
+++ b/test/JsonArray/prettyPrintTo.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonArray/printTo.cpp b/test/JsonArray/printTo.cpp
index 429332f0..d07e2e85 100644
--- a/test/JsonArray/printTo.cpp
+++ b/test/JsonArray/printTo.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonArray/remove.cpp b/test/JsonArray/remove.cpp
index 88ca6b94..5fda9ebd 100644
--- a/test/JsonArray/remove.cpp
+++ b/test/JsonArray/remove.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonArray/set.cpp b/test/JsonArray/set.cpp
index 8d58570a..1c0ad80b 100644
--- a/test/JsonArray/set.cpp
+++ b/test/JsonArray/set.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonArray/subscript.cpp b/test/JsonArray/subscript.cpp
index fd985568..aee9dd85 100644
--- a/test/JsonArray/subscript.cpp
+++ b/test/JsonArray/subscript.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <stdint.h>
diff --git a/test/JsonBuffer/CMakeLists.txt b/test/JsonBuffer/CMakeLists.txt
index 5d4d572b..6e1797d9 100644
--- a/test/JsonBuffer/CMakeLists.txt
+++ b/test/JsonBuffer/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-# 
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 add_executable(JsonBufferTests
 	nested.cpp
diff --git a/test/JsonBuffer/nested.cpp b/test/JsonBuffer/nested.cpp
index 87f11acd..25746ec6 100644
--- a/test/JsonBuffer/nested.cpp
+++ b/test/JsonBuffer/nested.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonBuffer/nestingLimit.cpp b/test/JsonBuffer/nestingLimit.cpp
index 7de8aa7a..c328bee3 100644
--- a/test/JsonBuffer/nestingLimit.cpp
+++ b/test/JsonBuffer/nestingLimit.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonBuffer/parse.cpp b/test/JsonBuffer/parse.cpp
index df15edc0..03ad5537 100644
--- a/test/JsonBuffer/parse.cpp
+++ b/test/JsonBuffer/parse.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonBuffer/parseArray.cpp b/test/JsonBuffer/parseArray.cpp
index 9fd12414..fa464500 100644
--- a/test/JsonBuffer/parseArray.cpp
+++ b/test/JsonBuffer/parseArray.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonBuffer/parseObject.cpp b/test/JsonBuffer/parseObject.cpp
index d202639d..deb8f524 100644
--- a/test/JsonBuffer/parseObject.cpp
+++ b/test/JsonBuffer/parseObject.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonObject/CMakeLists.txt b/test/JsonObject/CMakeLists.txt
index d9b97e45..61dce9f8 100644
--- a/test/JsonObject/CMakeLists.txt
+++ b/test/JsonObject/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-# 
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 add_executable(JsonObjectTests 
 	basics.cpp
diff --git a/test/JsonObject/basics.cpp b/test/JsonObject/basics.cpp
index 2ca4c3aa..275c2873 100644
--- a/test/JsonObject/basics.cpp
+++ b/test/JsonObject/basics.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonObject/containsKey.cpp b/test/JsonObject/containsKey.cpp
index cfec2043..e1dda37b 100644
--- a/test/JsonObject/containsKey.cpp
+++ b/test/JsonObject/containsKey.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonObject/get.cpp b/test/JsonObject/get.cpp
index 71a2a3ce..f2c0e968 100644
--- a/test/JsonObject/get.cpp
+++ b/test/JsonObject/get.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonObject/invalid.cpp b/test/JsonObject/invalid.cpp
index 1768f1a8..be7e2a52 100644
--- a/test/JsonObject/invalid.cpp
+++ b/test/JsonObject/invalid.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonObject/iterator.cpp b/test/JsonObject/iterator.cpp
index f7e918f0..b2563c25 100644
--- a/test/JsonObject/iterator.cpp
+++ b/test/JsonObject/iterator.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonObject/prettyPrintTo.cpp b/test/JsonObject/prettyPrintTo.cpp
index f9bd032d..55fd52a8 100644
--- a/test/JsonObject/prettyPrintTo.cpp
+++ b/test/JsonObject/prettyPrintTo.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonObject/printTo.cpp b/test/JsonObject/printTo.cpp
index 89b9f7a0..c3e537ec 100644
--- a/test/JsonObject/printTo.cpp
+++ b/test/JsonObject/printTo.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonObject/remove.cpp b/test/JsonObject/remove.cpp
index 60952dc7..fce58aff 100644
--- a/test/JsonObject/remove.cpp
+++ b/test/JsonObject/remove.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonObject/set.cpp b/test/JsonObject/set.cpp
index 75a11aa8..5e873d14 100644
--- a/test/JsonObject/set.cpp
+++ b/test/JsonObject/set.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonObject/subscript.cpp b/test/JsonObject/subscript.cpp
index 30c14039..f581b536 100644
--- a/test/JsonObject/subscript.cpp
+++ b/test/JsonObject/subscript.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonVariant/CMakeLists.txt b/test/JsonVariant/CMakeLists.txt
index ede0e98d..592dcbd8 100644
--- a/test/JsonVariant/CMakeLists.txt
+++ b/test/JsonVariant/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-# 
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 add_executable(JsonVariantTests 
 	as.cpp
diff --git a/test/JsonVariant/as.cpp b/test/JsonVariant/as.cpp
index e8089808..efa16912 100644
--- a/test/JsonVariant/as.cpp
+++ b/test/JsonVariant/as.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <stdint.h>
diff --git a/test/JsonVariant/compare.cpp b/test/JsonVariant/compare.cpp
index bf165ec8..81361a5a 100644
--- a/test/JsonVariant/compare.cpp
+++ b/test/JsonVariant/compare.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonVariant/copy.cpp b/test/JsonVariant/copy.cpp
index 0793689a..9cbf9782 100644
--- a/test/JsonVariant/copy.cpp
+++ b/test/JsonVariant/copy.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonVariant/is.cpp b/test/JsonVariant/is.cpp
index 747df359..d955a776 100644
--- a/test/JsonVariant/is.cpp
+++ b/test/JsonVariant/is.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonVariant/printTo.cpp b/test/JsonVariant/printTo.cpp
index bbb96e19..e8406747 100644
--- a/test/JsonVariant/printTo.cpp
+++ b/test/JsonVariant/printTo.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonVariant/set_get.cpp b/test/JsonVariant/set_get.cpp
index 1d317717..a615ec85 100644
--- a/test/JsonVariant/set_get.cpp
+++ b/test/JsonVariant/set_get.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <stdint.h>
diff --git a/test/JsonVariant/subscript.cpp b/test/JsonVariant/subscript.cpp
index a2ce3e2f..9412d1f8 100644
--- a/test/JsonVariant/subscript.cpp
+++ b/test/JsonVariant/subscript.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonVariant/success.cpp b/test/JsonVariant/success.cpp
index 2f19f938..b01db264 100644
--- a/test/JsonVariant/success.cpp
+++ b/test/JsonVariant/success.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonVariant/undefined.cpp b/test/JsonVariant/undefined.cpp
index 15436499..fa71cf94 100644
--- a/test/JsonVariant/undefined.cpp
+++ b/test/JsonVariant/undefined.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/JsonWriter/CMakeLists.txt b/test/JsonWriter/CMakeLists.txt
index e1ae81cc..f2ca45c2 100644
--- a/test/JsonWriter/CMakeLists.txt
+++ b/test/JsonWriter/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-# 
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 add_executable(JsonWriterTests 
 	writeFloat.cpp
diff --git a/test/JsonWriter/writeFloat.cpp b/test/JsonWriter/writeFloat.cpp
index f740b329..1d372623 100644
--- a/test/JsonWriter/writeFloat.cpp
+++ b/test/JsonWriter/writeFloat.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <catch.hpp>
 #include <limits>
diff --git a/test/JsonWriter/writeString.cpp b/test/JsonWriter/writeString.cpp
index 5a6cd58a..5be6722c 100644
--- a/test/JsonWriter/writeString.cpp
+++ b/test/JsonWriter/writeString.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <catch.hpp>
 
diff --git a/test/Misc/CMakeLists.txt b/test/Misc/CMakeLists.txt
index 531df655..363ebce9 100644
--- a/test/Misc/CMakeLists.txt
+++ b/test/Misc/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-# 
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 add_executable(MiscTests 
 	deprecated.cpp
diff --git a/test/Misc/FloatParts.cpp b/test/Misc/FloatParts.cpp
index eabe59f1..517d4cc2 100644
--- a/test/Misc/FloatParts.cpp
+++ b/test/Misc/FloatParts.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson/Serialization/FloatParts.hpp>
 #include <catch.hpp>
diff --git a/test/Misc/StringBuilder.cpp b/test/Misc/StringBuilder.cpp
index 78279fe2..13a4ee0e 100644
--- a/test/Misc/StringBuilder.cpp
+++ b/test/Misc/StringBuilder.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/Misc/TypeTraits.cpp b/test/Misc/TypeTraits.cpp
index 45341d12..7281a42c 100644
--- a/test/Misc/TypeTraits.cpp
+++ b/test/Misc/TypeTraits.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/Misc/deprecated.cpp b/test/Misc/deprecated.cpp
index a04c791f..d00aee01 100644
--- a/test/Misc/deprecated.cpp
+++ b/test/Misc/deprecated.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #define ARDUINOJSON_ENABLE_DEPRECATED 1
 
diff --git a/test/Misc/std_stream.cpp b/test/Misc/std_stream.cpp
index 60bba95b..602e3f22 100644
--- a/test/Misc/std_stream.cpp
+++ b/test/Misc/std_stream.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/Misc/std_string.cpp b/test/Misc/std_string.cpp
index c0907714..65c1e1f7 100644
--- a/test/Misc/std_string.cpp
+++ b/test/Misc/std_string.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/Misc/unsigned_char.cpp b/test/Misc/unsigned_char.cpp
index 7239a412..90daa680 100644
--- a/test/Misc/unsigned_char.cpp
+++ b/test/Misc/unsigned_char.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/Misc/vla.cpp b/test/Misc/vla.cpp
index 85959914..8257f0d7 100644
--- a/test/Misc/vla.cpp
+++ b/test/Misc/vla.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/Polyfills/CMakeLists.txt b/test/Polyfills/CMakeLists.txt
index bbc9165c..9fef3185 100644
--- a/test/Polyfills/CMakeLists.txt
+++ b/test/Polyfills/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-# 
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 add_executable(PolyfillsTests 
 	isFloat.cpp
diff --git a/test/Polyfills/isFloat.cpp b/test/Polyfills/isFloat.cpp
index 1e18c972..70591ee8 100644
--- a/test/Polyfills/isFloat.cpp
+++ b/test/Polyfills/isFloat.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson/Polyfills/isFloat.hpp>
 #include <catch.hpp>
diff --git a/test/Polyfills/isInteger.cpp b/test/Polyfills/isInteger.cpp
index 9638990a..ff6e3dbb 100644
--- a/test/Polyfills/isInteger.cpp
+++ b/test/Polyfills/isInteger.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson/Polyfills/isInteger.hpp>
 #include <catch.hpp>
diff --git a/test/Polyfills/parseFloat.cpp b/test/Polyfills/parseFloat.cpp
index c0e49b4f..c4462282 100644
--- a/test/Polyfills/parseFloat.cpp
+++ b/test/Polyfills/parseFloat.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson/Polyfills/parseFloat.hpp>
 #include <catch.hpp>
diff --git a/test/Polyfills/parseInteger.cpp b/test/Polyfills/parseInteger.cpp
index fbd23f3d..3010bb0c 100644
--- a/test/Polyfills/parseInteger.cpp
+++ b/test/Polyfills/parseInteger.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <stdint.h>
 #include <ArduinoJson/Polyfills/parseInteger.hpp>
diff --git a/test/StaticJsonBuffer/CMakeLists.txt b/test/StaticJsonBuffer/CMakeLists.txt
index 780678be..f4777bee 100644
--- a/test/StaticJsonBuffer/CMakeLists.txt
+++ b/test/StaticJsonBuffer/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-# 
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 add_executable(StaticJsonBufferTests 
 	alloc.cpp
diff --git a/test/StaticJsonBuffer/alloc.cpp b/test/StaticJsonBuffer/alloc.cpp
index 40948c8a..fda11f1a 100644
--- a/test/StaticJsonBuffer/alloc.cpp
+++ b/test/StaticJsonBuffer/alloc.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/StaticJsonBuffer/createArray.cpp b/test/StaticJsonBuffer/createArray.cpp
index 964a1303..fd7eff7a 100644
--- a/test/StaticJsonBuffer/createArray.cpp
+++ b/test/StaticJsonBuffer/createArray.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/StaticJsonBuffer/createObject.cpp b/test/StaticJsonBuffer/createObject.cpp
index 048a31be..b47e4236 100644
--- a/test/StaticJsonBuffer/createObject.cpp
+++ b/test/StaticJsonBuffer/createObject.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/StaticJsonBuffer/parseArray.cpp b/test/StaticJsonBuffer/parseArray.cpp
index 519a906a..ee22c2fc 100644
--- a/test/StaticJsonBuffer/parseArray.cpp
+++ b/test/StaticJsonBuffer/parseArray.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/StaticJsonBuffer/parseObject.cpp b/test/StaticJsonBuffer/parseObject.cpp
index 1542922f..8c413c63 100644
--- a/test/StaticJsonBuffer/parseObject.cpp
+++ b/test/StaticJsonBuffer/parseObject.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/StaticJsonBuffer/size.cpp b/test/StaticJsonBuffer/size.cpp
index 152a4c64..1105821b 100644
--- a/test/StaticJsonBuffer/size.cpp
+++ b/test/StaticJsonBuffer/size.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/test/StaticJsonBuffer/startString.cpp b/test/StaticJsonBuffer/startString.cpp
index 5ce02788..922e4e61 100644
--- a/test/StaticJsonBuffer/startString.cpp
+++ b/test/StaticJsonBuffer/startString.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
diff --git a/third-party/catch/CMakeLists.txt b/third-party/catch/CMakeLists.txt
index be172d5a..d518e8cc 100644
--- a/third-party/catch/CMakeLists.txt
+++ b/third-party/catch/CMakeLists.txt
@@ -1,9 +1,6 @@
+# ArduinoJson - arduinojson.org
 # Copyright Benoit Blanchon 2014-2017
 # MIT License
-# 
-# Arduino JSON library
-# https://bblanchon.github.io/ArduinoJson/
-# If you like this project, please add a star!
 
 add_library(catch
 	catch.hpp
diff --git a/third-party/catch/catch.cpp b/third-party/catch/catch.cpp
index dcce0822..4d8b7b6a 100644
--- a/third-party/catch/catch.cpp
+++ b/third-party/catch/catch.cpp
@@ -1,9 +1,6 @@
+// ArduinoJson - arduinojson.org
 // Copyright Benoit Blanchon 2014-2017
 // MIT License
-//
-// Arduino JSON library
-// https://bblanchon.github.io/ArduinoJson/
-// If you like this project, please add a star!
 
 #define CATCH_CONFIG_MAIN
 #include "catch.hpp"