diff --git a/ArduinoJson.h b/ArduinoJson.h
index 6dc6b0ca..ffea6601 100644
--- a/ArduinoJson.h
+++ b/ArduinoJson.h
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04597a30..d5c77399 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright Benoit Blanchon 2014-2016
+# Copyright Benoit Blanchon 2014-2017
 # MIT License
 # 
 # Arduino JSON library
diff --git a/LICENSE.md b/LICENSE.md
index fea79d80..627b1767 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 ---------------------
 
-Copyright © 2014-2016 Benoit BLANCHON
+Copyright © 2014-2017 Benoit BLANCHON
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/examples/IndentedPrintExample/IndentedPrintExample.ino b/examples/IndentedPrintExample/IndentedPrintExample.ino
index 9e86f0f5..f70fa7b2 100644
--- a/examples/IndentedPrintExample/IndentedPrintExample.ino
+++ b/examples/IndentedPrintExample/IndentedPrintExample.ino
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/examples/JsonGeneratorExample/JsonGeneratorExample.ino b/examples/JsonGeneratorExample/JsonGeneratorExample.ino
index 717a2276..c18d012d 100644
--- a/examples/JsonGeneratorExample/JsonGeneratorExample.ino
+++ b/examples/JsonGeneratorExample/JsonGeneratorExample.ino
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/examples/JsonHttpClient/JsonHttpClient.ino b/examples/JsonHttpClient/JsonHttpClient.ino
index cf868fc2..e8454f84 100644
--- a/examples/JsonHttpClient/JsonHttpClient.ino
+++ b/examples/JsonHttpClient/JsonHttpClient.ino
@@ -1,7 +1,7 @@
 // Sample Arduino Json Web Client
 // Downloads and parse http://jsonplaceholder.typicode.com/users/1
 //
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/examples/JsonParserExample/JsonParserExample.ino b/examples/JsonParserExample/JsonParserExample.ino
index 13536019..293894f2 100644
--- a/examples/JsonParserExample/JsonParserExample.ino
+++ b/examples/JsonParserExample/JsonParserExample.ino
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/examples/JsonUdpBeacon/JsonUdpBeacon.ino b/examples/JsonUdpBeacon/JsonUdpBeacon.ino
index 7b5c77cd..2975fad4 100644
--- a/examples/JsonUdpBeacon/JsonUdpBeacon.ino
+++ b/examples/JsonUdpBeacon/JsonUdpBeacon.ino
@@ -3,11 +3,11 @@
 // You can easily test this program with netcat:
 // $ nc -ulp 8888
 //
-// by Benoit Blanchon, MIT License 2015-2016
+// by Benoit Blanchon, MIT License 2015-2017
 
-#include <SPI.h>
-#include <Ethernet.h>
 #include <ArduinoJson.h>
+#include <Ethernet.h>
+#include <SPI.h>
 
 byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
 IPAddress localIp(192, 168, 0, 177);
diff --git a/examples/ProgmemExample/ProgmemExample.ino b/examples/ProgmemExample/ProgmemExample.ino
index 9ab3cf2b..dc8dd4bc 100644
--- a/examples/ProgmemExample/ProgmemExample.ino
+++ b/examples/ProgmemExample/ProgmemExample.ino
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/examples/StringExample/StringExample.ino b/examples/StringExample/StringExample.ino
index 359f64e3..f76f9dbe 100644
--- a/examples/StringExample/StringExample.ino
+++ b/examples/StringExample/StringExample.ino
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson.h b/include/ArduinoJson.h
index ec279cc2..48609d84 100644
--- a/include/ArduinoJson.h
+++ b/include/ArduinoJson.h
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson.hpp b/include/ArduinoJson.hpp
index 05085464..3031f592 100644
--- a/include/ArduinoJson.hpp
+++ b/include/ArduinoJson.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Configuration.hpp b/include/ArduinoJson/Configuration.hpp
index feb0e0e5..284ff333 100644
--- a/include/ArduinoJson/Configuration.hpp
+++ b/include/ArduinoJson/Configuration.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Data/Encoding.hpp b/include/ArduinoJson/Data/Encoding.hpp
index 017894ad..27d13517 100644
--- a/include/ArduinoJson/Data/Encoding.hpp
+++ b/include/ArduinoJson/Data/Encoding.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Data/JsonBufferAllocated.hpp b/include/ArduinoJson/Data/JsonBufferAllocated.hpp
index 05b88785..0004949b 100644
--- a/include/ArduinoJson/Data/JsonBufferAllocated.hpp
+++ b/include/ArduinoJson/Data/JsonBufferAllocated.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
@@ -19,7 +19,7 @@ class JsonBufferAllocated {
     return jsonBuffer->alloc(n);
   }
 
-  void operator delete(void *, JsonBuffer *) throw() {}
+  void operator delete(void *, JsonBuffer *)throw() {}
 };
 }
 }
diff --git a/include/ArduinoJson/Data/JsonFloat.hpp b/include/ArduinoJson/Data/JsonFloat.hpp
index 6da18258..40276fdc 100644
--- a/include/ArduinoJson/Data/JsonFloat.hpp
+++ b/include/ArduinoJson/Data/JsonFloat.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Data/JsonInteger.hpp b/include/ArduinoJson/Data/JsonInteger.hpp
index f273213c..d8fefa46 100644
--- a/include/ArduinoJson/Data/JsonInteger.hpp
+++ b/include/ArduinoJson/Data/JsonInteger.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Data/JsonVariantAs.hpp b/include/ArduinoJson/Data/JsonVariantAs.hpp
index 72431ed4..f8e6cd1e 100644
--- a/include/ArduinoJson/Data/JsonVariantAs.hpp
+++ b/include/ArduinoJson/Data/JsonVariantAs.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Data/JsonVariantContent.hpp b/include/ArduinoJson/Data/JsonVariantContent.hpp
index 77ae503c..ca86020a 100644
--- a/include/ArduinoJson/Data/JsonVariantContent.hpp
+++ b/include/ArduinoJson/Data/JsonVariantContent.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Data/JsonVariantDefault.hpp b/include/ArduinoJson/Data/JsonVariantDefault.hpp
index c3a31ad0..4e69a570 100644
--- a/include/ArduinoJson/Data/JsonVariantDefault.hpp
+++ b/include/ArduinoJson/Data/JsonVariantDefault.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Data/JsonVariantType.hpp b/include/ArduinoJson/Data/JsonVariantType.hpp
index 7af4c86b..da0e9a2e 100644
--- a/include/ArduinoJson/Data/JsonVariantType.hpp
+++ b/include/ArduinoJson/Data/JsonVariantType.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Data/List.hpp b/include/ArduinoJson/Data/List.hpp
index 2c01bfbc..e405635a 100644
--- a/include/ArduinoJson/Data/List.hpp
+++ b/include/ArduinoJson/Data/List.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Data/ListConstIterator.hpp b/include/ArduinoJson/Data/ListConstIterator.hpp
index 3be0e5f1..1707fe85 100644
--- a/include/ArduinoJson/Data/ListConstIterator.hpp
+++ b/include/ArduinoJson/Data/ListConstIterator.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
@@ -18,8 +18,12 @@ class ListConstIterator {
  public:
   explicit ListConstIterator(const ListNode<T> *node = NULL) : _node(node) {}
 
-  const T &operator*() const { return _node->content; }
-  const T *operator->() { return &_node->content; }
+  const T &operator*() const {
+    return _node->content;
+  }
+  const T *operator->() {
+    return &_node->content;
+  }
 
   bool operator==(const ListConstIterator<T> &other) const {
     return _node == other._node;
diff --git a/include/ArduinoJson/Data/ListIterator.hpp b/include/ArduinoJson/Data/ListIterator.hpp
index 5369cc5f..6604f5dd 100644
--- a/include/ArduinoJson/Data/ListIterator.hpp
+++ b/include/ArduinoJson/Data/ListIterator.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
@@ -7,8 +7,8 @@
 
 #pragma once
 
-#include "ListNode.hpp"
 #include "ListConstIterator.hpp"
+#include "ListNode.hpp"
 
 namespace ArduinoJson {
 namespace Internals {
@@ -19,8 +19,12 @@ class ListIterator {
  public:
   explicit ListIterator(ListNode<T> *node = NULL) : _node(node) {}
 
-  T &operator*() const { return _node->content; }
-  T *operator->() { return &_node->content; }
+  T &operator*() const {
+    return _node->content;
+  }
+  T *operator->() {
+    return &_node->content;
+  }
 
   bool operator==(const ListIterator<T> &other) const {
     return _node == other._node;
@@ -35,7 +39,9 @@ class ListIterator {
     return *this;
   }
 
-  operator ListConstIterator<T>() const { return ListConstIterator<T>(_node); }
+  operator ListConstIterator<T>() const {
+    return ListConstIterator<T>(_node);
+  }
 
  private:
   ListNode<T> *_node;
diff --git a/include/ArduinoJson/Data/ListNode.hpp b/include/ArduinoJson/Data/ListNode.hpp
index 9af770aa..d3b65ae9 100644
--- a/include/ArduinoJson/Data/ListNode.hpp
+++ b/include/ArduinoJson/Data/ListNode.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Data/Parse.hpp b/include/ArduinoJson/Data/Parse.hpp
index 6a59e8d6..879f3d2f 100644
--- a/include/ArduinoJson/Data/Parse.hpp
+++ b/include/ArduinoJson/Data/Parse.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Data/ReferenceType.hpp b/include/ArduinoJson/Data/ReferenceType.hpp
index 41fe402e..9ffbbd9b 100644
--- a/include/ArduinoJson/Data/ReferenceType.hpp
+++ b/include/ArduinoJson/Data/ReferenceType.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
@@ -19,7 +19,9 @@ class ReferenceType {
     return this == &other;
   }
 
-  bool operator!=(const ReferenceType& other) const { return this != &other; }
+  bool operator!=(const ReferenceType& other) const {
+    return this != &other;
+  }
 
  protected:
   ReferenceType() {}
diff --git a/include/ArduinoJson/Data/ValueSetter.hpp b/include/ArduinoJson/Data/ValueSetter.hpp
index fc007c9a..07d3ddd6 100644
--- a/include/ArduinoJson/Data/ValueSetter.hpp
+++ b/include/ArduinoJson/Data/ValueSetter.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Deserialization/Comments.hpp b/include/ArduinoJson/Deserialization/Comments.hpp
index 6586777e..7ee42342 100644
--- a/include/ArduinoJson/Deserialization/Comments.hpp
+++ b/include/ArduinoJson/Deserialization/Comments.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Deserialization/JsonParser.hpp b/include/ArduinoJson/Deserialization/JsonParser.hpp
index c27534ee..e38a4d19 100644
--- a/include/ArduinoJson/Deserialization/JsonParser.hpp
+++ b/include/ArduinoJson/Deserialization/JsonParser.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Deserialization/JsonParserImpl.hpp b/include/ArduinoJson/Deserialization/JsonParserImpl.hpp
index dc861d73..260f0b84 100644
--- a/include/ArduinoJson/Deserialization/JsonParserImpl.hpp
+++ b/include/ArduinoJson/Deserialization/JsonParserImpl.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Deserialization/StringReader.hpp b/include/ArduinoJson/Deserialization/StringReader.hpp
index e0e6fe78..c45eea27 100644
--- a/include/ArduinoJson/Deserialization/StringReader.hpp
+++ b/include/ArduinoJson/Deserialization/StringReader.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Deserialization/StringWriter.hpp b/include/ArduinoJson/Deserialization/StringWriter.hpp
index 9ace9a3f..44e6434a 100644
--- a/include/ArduinoJson/Deserialization/StringWriter.hpp
+++ b/include/ArduinoJson/Deserialization/StringWriter.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/DynamicJsonBuffer.hpp b/include/ArduinoJson/DynamicJsonBuffer.hpp
index 67eab0d8..0b2b783b 100644
--- a/include/ArduinoJson/DynamicJsonBuffer.hpp
+++ b/include/ArduinoJson/DynamicJsonBuffer.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonArray.hpp b/include/ArduinoJson/JsonArray.hpp
index f4ad0edb..0b3f0529 100644
--- a/include/ArduinoJson/JsonArray.hpp
+++ b/include/ArduinoJson/JsonArray.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonArrayImpl.hpp b/include/ArduinoJson/JsonArrayImpl.hpp
index 6868f48b..d065d1d0 100644
--- a/include/ArduinoJson/JsonArrayImpl.hpp
+++ b/include/ArduinoJson/JsonArrayImpl.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonArraySubscript.hpp b/include/ArduinoJson/JsonArraySubscript.hpp
index b7475104..111f193d 100644
--- a/include/ArduinoJson/JsonArraySubscript.hpp
+++ b/include/ArduinoJson/JsonArraySubscript.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonBuffer.hpp b/include/ArduinoJson/JsonBuffer.hpp
index fdef06a1..0068b05b 100644
--- a/include/ArduinoJson/JsonBuffer.hpp
+++ b/include/ArduinoJson/JsonBuffer.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonBufferBase.hpp b/include/ArduinoJson/JsonBufferBase.hpp
index 645dd9ea..ba4cb2a9 100644
--- a/include/ArduinoJson/JsonBufferBase.hpp
+++ b/include/ArduinoJson/JsonBufferBase.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonBufferImpl.hpp b/include/ArduinoJson/JsonBufferImpl.hpp
index 67c76970..fab8eeff 100644
--- a/include/ArduinoJson/JsonBufferImpl.hpp
+++ b/include/ArduinoJson/JsonBufferImpl.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonObject.hpp b/include/ArduinoJson/JsonObject.hpp
index ab8cbf7f..24e74e15 100644
--- a/include/ArduinoJson/JsonObject.hpp
+++ b/include/ArduinoJson/JsonObject.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonObjectImpl.hpp b/include/ArduinoJson/JsonObjectImpl.hpp
index eb58c168..47dcce58 100644
--- a/include/ArduinoJson/JsonObjectImpl.hpp
+++ b/include/ArduinoJson/JsonObjectImpl.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonObjectSubscript.hpp b/include/ArduinoJson/JsonObjectSubscript.hpp
index a5164b25..2dcecb9f 100644
--- a/include/ArduinoJson/JsonObjectSubscript.hpp
+++ b/include/ArduinoJson/JsonObjectSubscript.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonPair.hpp b/include/ArduinoJson/JsonPair.hpp
index faaeb905..09fa4e8d 100644
--- a/include/ArduinoJson/JsonPair.hpp
+++ b/include/ArduinoJson/JsonPair.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonVariant.hpp b/include/ArduinoJson/JsonVariant.hpp
index 99139026..43d01254 100644
--- a/include/ArduinoJson/JsonVariant.hpp
+++ b/include/ArduinoJson/JsonVariant.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonVariantBase.hpp b/include/ArduinoJson/JsonVariantBase.hpp
index 9ab71b95..503da2e9 100644
--- a/include/ArduinoJson/JsonVariantBase.hpp
+++ b/include/ArduinoJson/JsonVariantBase.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonVariantComparisons.hpp b/include/ArduinoJson/JsonVariantComparisons.hpp
index 6c038339..8af2f780 100644
--- a/include/ArduinoJson/JsonVariantComparisons.hpp
+++ b/include/ArduinoJson/JsonVariantComparisons.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/JsonVariantImpl.hpp b/include/ArduinoJson/JsonVariantImpl.hpp
index 49456d69..a40f6dcb 100644
--- a/include/ArduinoJson/JsonVariantImpl.hpp
+++ b/include/ArduinoJson/JsonVariantImpl.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Polyfills/attributes.hpp b/include/ArduinoJson/Polyfills/attributes.hpp
index ac215f4d..9992d594 100644
--- a/include/ArduinoJson/Polyfills/attributes.hpp
+++ b/include/ArduinoJson/Polyfills/attributes.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Polyfills/math.hpp b/include/ArduinoJson/Polyfills/math.hpp
index 2d08a8e9..492936a3 100644
--- a/include/ArduinoJson/Polyfills/math.hpp
+++ b/include/ArduinoJson/Polyfills/math.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Polyfills/normalize.hpp b/include/ArduinoJson/Polyfills/normalize.hpp
index 5aea7f13..4b9bebe6 100644
--- a/include/ArduinoJson/Polyfills/normalize.hpp
+++ b/include/ArduinoJson/Polyfills/normalize.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Print.hpp b/include/ArduinoJson/Print.hpp
index 78243a5c..9f3dee70 100644
--- a/include/ArduinoJson/Print.hpp
+++ b/include/ArduinoJson/Print.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/RawJson.hpp b/include/ArduinoJson/RawJson.hpp
index 1141e8a1..70376f98 100644
--- a/include/ArduinoJson/RawJson.hpp
+++ b/include/ArduinoJson/RawJson.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Serialization/DummyPrint.hpp b/include/ArduinoJson/Serialization/DummyPrint.hpp
index 4e9efcaa..1e17a788 100644
--- a/include/ArduinoJson/Serialization/DummyPrint.hpp
+++ b/include/ArduinoJson/Serialization/DummyPrint.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
@@ -15,7 +15,9 @@ namespace Internals {
 // A dummy Print implementation used in JsonPrintable::measureLength()
 class DummyPrint : public Print {
  public:
-  virtual size_t write(uint8_t) { return 1; }
+  virtual size_t write(uint8_t) {
+    return 1;
+  }
 };
 }
 }
diff --git a/include/ArduinoJson/Serialization/DynamicStringBuilder.hpp b/include/ArduinoJson/Serialization/DynamicStringBuilder.hpp
index 899a2989..56a935f2 100644
--- a/include/ArduinoJson/Serialization/DynamicStringBuilder.hpp
+++ b/include/ArduinoJson/Serialization/DynamicStringBuilder.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Serialization/IndentedPrint.hpp b/include/ArduinoJson/Serialization/IndentedPrint.hpp
index 6984fab1..a9756431 100644
--- a/include/ArduinoJson/Serialization/IndentedPrint.hpp
+++ b/include/ArduinoJson/Serialization/IndentedPrint.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Serialization/JsonPrintable.hpp b/include/ArduinoJson/Serialization/JsonPrintable.hpp
index dfecfdce..fba1ce14 100644
--- a/include/ArduinoJson/Serialization/JsonPrintable.hpp
+++ b/include/ArduinoJson/Serialization/JsonPrintable.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Serialization/JsonSerializer.hpp b/include/ArduinoJson/Serialization/JsonSerializer.hpp
index ec59d9b4..d5003338 100644
--- a/include/ArduinoJson/Serialization/JsonSerializer.hpp
+++ b/include/ArduinoJson/Serialization/JsonSerializer.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Serialization/JsonSerializerImpl.hpp b/include/ArduinoJson/Serialization/JsonSerializerImpl.hpp
index 53e9e429..847ce2f2 100644
--- a/include/ArduinoJson/Serialization/JsonSerializerImpl.hpp
+++ b/include/ArduinoJson/Serialization/JsonSerializerImpl.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Serialization/JsonWriter.hpp b/include/ArduinoJson/Serialization/JsonWriter.hpp
index 92027011..35a59909 100644
--- a/include/ArduinoJson/Serialization/JsonWriter.hpp
+++ b/include/ArduinoJson/Serialization/JsonWriter.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Serialization/Prettyfier.hpp b/include/ArduinoJson/Serialization/Prettyfier.hpp
index 192e63e1..fbb364b3 100644
--- a/include/ArduinoJson/Serialization/Prettyfier.hpp
+++ b/include/ArduinoJson/Serialization/Prettyfier.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Serialization/StaticStringBuilder.hpp b/include/ArduinoJson/Serialization/StaticStringBuilder.hpp
index 34bf00dd..19328b3c 100644
--- a/include/ArduinoJson/Serialization/StaticStringBuilder.hpp
+++ b/include/ArduinoJson/Serialization/StaticStringBuilder.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/Serialization/StreamPrintAdapter.hpp b/include/ArduinoJson/Serialization/StreamPrintAdapter.hpp
index e954ea4a..23007af7 100644
--- a/include/ArduinoJson/Serialization/StreamPrintAdapter.hpp
+++ b/include/ArduinoJson/Serialization/StreamPrintAdapter.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/StaticJsonBuffer.hpp b/include/ArduinoJson/StaticJsonBuffer.hpp
index 2908772d..1760168a 100644
--- a/include/ArduinoJson/StaticJsonBuffer.hpp
+++ b/include/ArduinoJson/StaticJsonBuffer.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/StringTraits/ArduinoStream.hpp b/include/ArduinoJson/StringTraits/ArduinoStream.hpp
index 977588c5..de66bc35 100644
--- a/include/ArduinoJson/StringTraits/ArduinoStream.hpp
+++ b/include/ArduinoJson/StringTraits/ArduinoStream.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/StringTraits/CharPointer.hpp b/include/ArduinoJson/StringTraits/CharPointer.hpp
index b76ef647..16e8f4c2 100644
--- a/include/ArduinoJson/StringTraits/CharPointer.hpp
+++ b/include/ArduinoJson/StringTraits/CharPointer.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/StringTraits/FlashString.hpp b/include/ArduinoJson/StringTraits/FlashString.hpp
index e7e66ad0..82711633 100644
--- a/include/ArduinoJson/StringTraits/FlashString.hpp
+++ b/include/ArduinoJson/StringTraits/FlashString.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/StringTraits/StdStream.hpp b/include/ArduinoJson/StringTraits/StdStream.hpp
index a1c9f2ea..38f7954b 100644
--- a/include/ArduinoJson/StringTraits/StdStream.hpp
+++ b/include/ArduinoJson/StringTraits/StdStream.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/StringTraits/StdString.hpp b/include/ArduinoJson/StringTraits/StdString.hpp
index b2e9fb95..cfb848cf 100644
--- a/include/ArduinoJson/StringTraits/StdString.hpp
+++ b/include/ArduinoJson/StringTraits/StdString.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/StringTraits/StringTraits.hpp b/include/ArduinoJson/StringTraits/StringTraits.hpp
index 5f26167c..b4f23e84 100644
--- a/include/ArduinoJson/StringTraits/StringTraits.hpp
+++ b/include/ArduinoJson/StringTraits/StringTraits.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/TypeTraits/ConstRefOrConstPtr.hpp b/include/ArduinoJson/TypeTraits/ConstRefOrConstPtr.hpp
index cdfd7fc2..19d83708 100644
--- a/include/ArduinoJson/TypeTraits/ConstRefOrConstPtr.hpp
+++ b/include/ArduinoJson/TypeTraits/ConstRefOrConstPtr.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/TypeTraits/EnableIf.hpp b/include/ArduinoJson/TypeTraits/EnableIf.hpp
index cedbbf46..44a4ed5b 100644
--- a/include/ArduinoJson/TypeTraits/EnableIf.hpp
+++ b/include/ArduinoJson/TypeTraits/EnableIf.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/TypeTraits/IsBaseOf.hpp b/include/ArduinoJson/TypeTraits/IsBaseOf.hpp
index d3b4f06a..b8375b0c 100644
--- a/include/ArduinoJson/TypeTraits/IsBaseOf.hpp
+++ b/include/ArduinoJson/TypeTraits/IsBaseOf.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/TypeTraits/IsFloatingPoint.hpp b/include/ArduinoJson/TypeTraits/IsFloatingPoint.hpp
index c9fe764d..a08f76c3 100644
--- a/include/ArduinoJson/TypeTraits/IsFloatingPoint.hpp
+++ b/include/ArduinoJson/TypeTraits/IsFloatingPoint.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/TypeTraits/IsIntegral.hpp b/include/ArduinoJson/TypeTraits/IsIntegral.hpp
index 7849dcff..21b5c424 100644
--- a/include/ArduinoJson/TypeTraits/IsIntegral.hpp
+++ b/include/ArduinoJson/TypeTraits/IsIntegral.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/TypeTraits/IsSame.hpp b/include/ArduinoJson/TypeTraits/IsSame.hpp
index c28a89c1..74d03a3c 100644
--- a/include/ArduinoJson/TypeTraits/IsSame.hpp
+++ b/include/ArduinoJson/TypeTraits/IsSame.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/TypeTraits/IsSignedIntegral.hpp b/include/ArduinoJson/TypeTraits/IsSignedIntegral.hpp
index 7973dd75..8169d07f 100644
--- a/include/ArduinoJson/TypeTraits/IsSignedIntegral.hpp
+++ b/include/ArduinoJson/TypeTraits/IsSignedIntegral.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp b/include/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp
index 21d9ad50..02fc3279 100644
--- a/include/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp
+++ b/include/ArduinoJson/TypeTraits/IsUnsignedIntegral.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/TypeTraits/RemoveConst.hpp b/include/ArduinoJson/TypeTraits/RemoveConst.hpp
index 1be9dac5..eae23082 100644
--- a/include/ArduinoJson/TypeTraits/RemoveConst.hpp
+++ b/include/ArduinoJson/TypeTraits/RemoveConst.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/include/ArduinoJson/TypeTraits/RemoveReference.hpp b/include/ArduinoJson/TypeTraits/RemoveReference.hpp
index f79a2dc0..8d57c835 100644
--- a/include/ArduinoJson/TypeTraits/RemoveReference.hpp
+++ b/include/ArduinoJson/TypeTraits/RemoveReference.hpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0fa6ade2..241fa38f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright Benoit Blanchon 2014-2016
+# Copyright Benoit Blanchon 2014-2017
 # MIT License
 #
 # Arduino JSON library
diff --git a/test/DynamicJsonBuffer_Array_Tests.cpp b/test/DynamicJsonBuffer_Array_Tests.cpp
index 3f0c6c13..db343d04 100644
--- a/test/DynamicJsonBuffer_Array_Tests.cpp
+++ b/test/DynamicJsonBuffer_Array_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 TEST(DynamicJsonBuffer_Array_Tests, GrowsWithArray) {
   DynamicJsonBuffer jsonBuffer;
diff --git a/test/DynamicJsonBuffer_Basic_Tests.cpp b/test/DynamicJsonBuffer_Basic_Tests.cpp
index 61365ac7..abd5a1da 100644
--- a/test/DynamicJsonBuffer_Basic_Tests.cpp
+++ b/test/DynamicJsonBuffer_Basic_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/DynamicJsonBuffer_NoMemory_Tests.cpp b/test/DynamicJsonBuffer_NoMemory_Tests.cpp
index fe190734..398d8da4 100644
--- a/test/DynamicJsonBuffer_NoMemory_Tests.cpp
+++ b/test/DynamicJsonBuffer_NoMemory_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/DynamicJsonBuffer_Object_Tests.cpp b/test/DynamicJsonBuffer_Object_Tests.cpp
index 5188d1a9..9760a003 100644
--- a/test/DynamicJsonBuffer_Object_Tests.cpp
+++ b/test/DynamicJsonBuffer_Object_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 TEST(DynamicJsonBuffer_Object_Tests, GrowsWithObject) {
   DynamicJsonBuffer json;
diff --git a/test/DynamicJsonBuffer_String_Tests.cpp b/test/DynamicJsonBuffer_String_Tests.cpp
index ad3e0fc4..6648d21b 100644
--- a/test/DynamicJsonBuffer_String_Tests.cpp
+++ b/test/DynamicJsonBuffer_String_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/GbathreeBug.cpp b/test/GbathreeBug.cpp
index 36e65037..692e1b60 100644
--- a/test/GbathreeBug.cpp
+++ b/test/GbathreeBug.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class GbathreeBug : public testing::Test {
  public:
@@ -34,37 +34,61 @@ class GbathreeBug : public testing::Test {
   }
 };
 
-TEST_F(GbathreeBug, Success) { EXPECT_TRUE(_object.success()); }
+TEST_F(GbathreeBug, Success) {
+  EXPECT_TRUE(_object.success());
+}
 
 TEST_F(GbathreeBug, ProtocolName) {
   EXPECT_STREQ("fluorescence", _object["protocol_name"]);
 }
 
-TEST_F(GbathreeBug, Repeats) { EXPECT_EQ(1, _object["repeats"]); }
+TEST_F(GbathreeBug, Repeats) {
+  EXPECT_EQ(1, _object["repeats"]);
+}
 
-TEST_F(GbathreeBug, Wait) { EXPECT_EQ(0, _object["wait"]); }
+TEST_F(GbathreeBug, Wait) {
+  EXPECT_EQ(0, _object["wait"]);
+}
 
-TEST_F(GbathreeBug, Measurements) { EXPECT_EQ(3, _object["measurements"]); }
+TEST_F(GbathreeBug, Measurements) {
+  EXPECT_EQ(3, _object["measurements"]);
+}
 
-TEST_F(GbathreeBug, Meas2_Light) { EXPECT_EQ(15, _object["meas2_light"]); }
+TEST_F(GbathreeBug, Meas2_Light) {
+  EXPECT_EQ(15, _object["meas2_light"]);
+}
 
-TEST_F(GbathreeBug, Meas1_Baseline) { EXPECT_EQ(0, _object["meas1_baseline"]); }
+TEST_F(GbathreeBug, Meas1_Baseline) {
+  EXPECT_EQ(0, _object["meas1_baseline"]);
+}
 
-TEST_F(GbathreeBug, Act_Light) { EXPECT_EQ(20, _object["act_light"]); }
+TEST_F(GbathreeBug, Act_Light) {
+  EXPECT_EQ(20, _object["act_light"]);
+}
 
-TEST_F(GbathreeBug, Pulsesize) { EXPECT_EQ(25, _object["pulsesize"]); }
+TEST_F(GbathreeBug, Pulsesize) {
+  EXPECT_EQ(25, _object["pulsesize"]);
+}
 
 TEST_F(GbathreeBug, Pulsedistance) {
   EXPECT_EQ(10000, _object["pulsedistance"]);
 }
 
-TEST_F(GbathreeBug, Actintensity1) { EXPECT_EQ(50, _object["actintensity1"]); }
+TEST_F(GbathreeBug, Actintensity1) {
+  EXPECT_EQ(50, _object["actintensity1"]);
+}
 
-TEST_F(GbathreeBug, Actintensity2) { EXPECT_EQ(255, _object["actintensity2"]); }
+TEST_F(GbathreeBug, Actintensity2) {
+  EXPECT_EQ(255, _object["actintensity2"]);
+}
 
-TEST_F(GbathreeBug, Measintensity) { EXPECT_EQ(255, _object["measintensity"]); }
+TEST_F(GbathreeBug, Measintensity) {
+  EXPECT_EQ(255, _object["measintensity"]);
+}
 
-TEST_F(GbathreeBug, Calintensity) { EXPECT_EQ(255, _object["calintensity"]); }
+TEST_F(GbathreeBug, Calintensity) {
+  EXPECT_EQ(255, _object["calintensity"]);
+}
 
 TEST_F(GbathreeBug, Pulses) {
   // "pulses":[50,50,50]
diff --git a/test/IntegrationTests.cpp b/test/IntegrationTests.cpp
index 5dfb03c2..4957a882 100644
--- a/test/IntegrationTests.cpp
+++ b/test/IntegrationTests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class IntegrationTests : public testing::TestWithParam<const char*> {
   static const size_t MAX_JSON_SIZE = 10000;
diff --git a/test/Issue10.cpp b/test/Issue10.cpp
index 7a60a598..61ec0fa4 100644
--- a/test/Issue10.cpp
+++ b/test/Issue10.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 struct Person {
   int id;
diff --git a/test/Issue214.cpp b/test/Issue214.cpp
index 140f2052..bd029663 100644
--- a/test/Issue214.cpp
+++ b/test/Issue214.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/Issue34.cpp b/test/Issue34.cpp
index 4f6b0f5c..aceb6b5f 100644
--- a/test/Issue34.cpp
+++ b/test/Issue34.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class Issue34 : public testing::Test {
  protected:
@@ -23,18 +23,34 @@ class Issue34 : public testing::Test {
   }
 };
 
-TEST_F(Issue34, int8_t) { test_with_value<int8_t>(1); }
+TEST_F(Issue34, int8_t) {
+  test_with_value<int8_t>(1);
+}
 
-TEST_F(Issue34, uint8_t) { test_with_value<uint8_t>(2); }
+TEST_F(Issue34, uint8_t) {
+  test_with_value<uint8_t>(2);
+}
 
-TEST_F(Issue34, int16_t) { test_with_value<int16_t>(3); }
+TEST_F(Issue34, int16_t) {
+  test_with_value<int16_t>(3);
+}
 
-TEST_F(Issue34, uint16_t) { test_with_value<uint16_t>(4); }
+TEST_F(Issue34, uint16_t) {
+  test_with_value<uint16_t>(4);
+}
 
-TEST_F(Issue34, int32_t) { test_with_value<int32_t>(5); }
+TEST_F(Issue34, int32_t) {
+  test_with_value<int32_t>(5);
+}
 
-TEST_F(Issue34, uint32_t) { test_with_value<uint32_t>(6); }
+TEST_F(Issue34, uint32_t) {
+  test_with_value<uint32_t>(6);
+}
 
-TEST_F(Issue34, float) { test_with_value<float>(7); }
+TEST_F(Issue34, float) {
+  test_with_value<float>(7);
+}
 
-TEST_F(Issue34, double) { test_with_value<double>(8); }
+TEST_F(Issue34, double) {
+  test_with_value<double>(8);
+}
diff --git a/test/Issue90.cpp b/test/Issue90.cpp
index 51845dd7..dffe669e 100644
--- a/test/Issue90.cpp
+++ b/test/Issue90.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
@@ -20,10 +20,18 @@ static const char* superLong =
 
 static const JsonVariant variant = RawJson(superLong);
 
-TEST(SUITE, IsNotALong) { ASSERT_FALSE(variant.is<long>()); }
+TEST(SUITE, IsNotALong) {
+  ASSERT_FALSE(variant.is<long>());
+}
 
-TEST(SUITE, AsLong) { ASSERT_EQ(LONG_MAX, variant.as<long>()); }
+TEST(SUITE, AsLong) {
+  ASSERT_EQ(LONG_MAX, variant.as<long>());
+}
 
-TEST(SUITE, IsAString) { ASSERT_FALSE(variant.is<const char*>()); }
+TEST(SUITE, IsAString) {
+  ASSERT_FALSE(variant.is<const char*>());
+}
 
-TEST(SUITE, AsString) { ASSERT_STREQ(superLong, variant.as<const char*>()); }
+TEST(SUITE, AsString) {
+  ASSERT_STREQ(superLong, variant.as<const char*>());
+}
diff --git a/test/JsonArray_Add_Tests.cpp b/test/JsonArray_Add_Tests.cpp
index 3324e1b8..8ecd9545 100644
--- a/test/JsonArray_Add_Tests.cpp
+++ b/test/JsonArray_Add_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class JsonArray_Add_Tests : public ::testing::Test {
  protected:
diff --git a/test/JsonArray_Basic_Tests.cpp b/test/JsonArray_Basic_Tests.cpp
index 71f9a83f..b5121832 100644
--- a/test/JsonArray_Basic_Tests.cpp
+++ b/test/JsonArray_Basic_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 #define TEST_(name) TEST(JsonArray_Basic_Tests, name)
 
diff --git a/test/JsonArray_CopyFrom_Tests.cpp b/test/JsonArray_CopyFrom_Tests.cpp
index 02dbd505..216f75cf 100644
--- a/test/JsonArray_CopyFrom_Tests.cpp
+++ b/test/JsonArray_CopyFrom_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonArray_CopyTo_Tests.cpp b/test/JsonArray_CopyTo_Tests.cpp
index 8a8279cc..e5693430 100644
--- a/test/JsonArray_CopyTo_Tests.cpp
+++ b/test/JsonArray_CopyTo_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonArray_Invalid_Tests.cpp b/test/JsonArray_Invalid_Tests.cpp
index 55664bad..193d1f41 100644
--- a/test/JsonArray_Invalid_Tests.cpp
+++ b/test/JsonArray_Invalid_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 TEST(JsonArray_Invalid_Tests, SubscriptFails) {
   ASSERT_FALSE(JsonArray::invalid()[0].success());
diff --git a/test/JsonArray_Iterator_Tests.cpp b/test/JsonArray_Iterator_Tests.cpp
index 842ae69d..18ec4580 100644
--- a/test/JsonArray_Iterator_Tests.cpp
+++ b/test/JsonArray_Iterator_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 template <typename TIterator>
 static void run_iterator_test() {
diff --git a/test/JsonArray_PrettyPrintTo_Tests.cpp b/test/JsonArray_PrettyPrintTo_Tests.cpp
index 6f858b74..7b990d47 100644
--- a/test/JsonArray_PrettyPrintTo_Tests.cpp
+++ b/test/JsonArray_PrettyPrintTo_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonArray_PrintTo_Tests.cpp b/test/JsonArray_PrintTo_Tests.cpp
index e75acd58..a6999376 100644
--- a/test/JsonArray_PrintTo_Tests.cpp
+++ b/test/JsonArray_PrintTo_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonArray_Remove_Tests.cpp b/test/JsonArray_Remove_Tests.cpp
index dd6796cd..dd2ee7a3 100644
--- a/test/JsonArray_Remove_Tests.cpp
+++ b/test/JsonArray_Remove_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class JsonArray_Remove_Tests : public ::testing::Test {
  protected:
diff --git a/test/JsonArray_Set_Tests.cpp b/test/JsonArray_Set_Tests.cpp
index 8535d8d5..a5da0d09 100644
--- a/test/JsonArray_Set_Tests.cpp
+++ b/test/JsonArray_Set_Tests.cpp
@@ -1,16 +1,18 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class JsonArray_Set_Tests : public ::testing::Test {
  protected:
-  JsonArray_Set_Tests() : _array(_jsonBuffer.createArray()) { _array.add(0); }
+  JsonArray_Set_Tests() : _array(_jsonBuffer.createArray()) {
+    _array.add(0);
+  }
 
   DynamicJsonBuffer _jsonBuffer;
   JsonArray& _array;
diff --git a/test/JsonArray_Subscript_Tests.cpp b/test/JsonArray_Subscript_Tests.cpp
index 9325ede6..eead7117 100644
--- a/test/JsonArray_Subscript_Tests.cpp
+++ b/test/JsonArray_Subscript_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonObject_Basic_Tests.cpp b/test/JsonObject_Basic_Tests.cpp
index dab2f097..7bebcffa 100644
--- a/test/JsonObject_Basic_Tests.cpp
+++ b/test/JsonObject_Basic_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 #define TEST_(name) TEST(JsonObject_Basic_Tests, name)
 
diff --git a/test/JsonObject_ContainsKey_Tests.cpp b/test/JsonObject_ContainsKey_Tests.cpp
index 65e3122a..c79310e3 100644
--- a/test/JsonObject_ContainsKey_Tests.cpp
+++ b/test/JsonObject_ContainsKey_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 #define TEST_(name) TEST(JsonObject_Basic_Tests, name)
 
diff --git a/test/JsonObject_Get_Tests.cpp b/test/JsonObject_Get_Tests.cpp
index dfd9d08c..b06da8a7 100644
--- a/test/JsonObject_Get_Tests.cpp
+++ b/test/JsonObject_Get_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonObject_Invalid_Tests.cpp b/test/JsonObject_Invalid_Tests.cpp
index 3964d216..108176b9 100644
--- a/test/JsonObject_Invalid_Tests.cpp
+++ b/test/JsonObject_Invalid_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonObject_Iterator_Tests.cpp b/test/JsonObject_Iterator_Tests.cpp
index 0d35856e..35da134e 100644
--- a/test/JsonObject_Iterator_Tests.cpp
+++ b/test/JsonObject_Iterator_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class JsonObject_Iterator_Test : public testing::Test {
  public:
diff --git a/test/JsonObject_PrettyPrintTo_Tests.cpp b/test/JsonObject_PrettyPrintTo_Tests.cpp
index 0e904415..f92456b3 100644
--- a/test/JsonObject_PrettyPrintTo_Tests.cpp
+++ b/test/JsonObject_PrettyPrintTo_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonObject_PrintTo_Tests.cpp b/test/JsonObject_PrintTo_Tests.cpp
index bfb1c744..4c8204b7 100644
--- a/test/JsonObject_PrintTo_Tests.cpp
+++ b/test/JsonObject_PrintTo_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonObject_Remove_Tests.cpp b/test/JsonObject_Remove_Tests.cpp
index 8fa44279..689a3c2f 100644
--- a/test/JsonObject_Remove_Tests.cpp
+++ b/test/JsonObject_Remove_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 #define TEST_(name) TEST(JsonObject_Remove_Tests, name)
 
diff --git a/test/JsonObject_Set_Tests.cpp b/test/JsonObject_Set_Tests.cpp
index 29bb9996..1b11696d 100644
--- a/test/JsonObject_Set_Tests.cpp
+++ b/test/JsonObject_Set_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonObject_Subscript_Tests.cpp b/test/JsonObject_Subscript_Tests.cpp
index 52f72d89..21c3034a 100644
--- a/test/JsonObject_Subscript_Tests.cpp
+++ b/test/JsonObject_Subscript_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonParser_Array_Tests.cpp b/test/JsonParser_Array_Tests.cpp
index 7f016d32..0764e920 100644
--- a/test/JsonParser_Array_Tests.cpp
+++ b/test/JsonParser_Array_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonParser_Nested_Tests.cpp b/test/JsonParser_Nested_Tests.cpp
index a9e2a956..8d2051cf 100644
--- a/test/JsonParser_Nested_Tests.cpp
+++ b/test/JsonParser_Nested_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 TEST(JsonParser_Nested_Tests, ArrayNestedInObject) {
   DynamicJsonBuffer jsonBuffer;
diff --git a/test/JsonParser_NestingLimit_Tests.cpp b/test/JsonParser_NestingLimit_Tests.cpp
index dde8edba..70242025 100644
--- a/test/JsonParser_NestingLimit_Tests.cpp
+++ b/test/JsonParser_NestingLimit_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class JsonParser_NestingLimit_Tests : public testing::Test {
  protected:
diff --git a/test/JsonParser_Object_Tests.cpp b/test/JsonParser_Object_Tests.cpp
index 1b466297..a0f96b21 100644
--- a/test/JsonParser_Object_Tests.cpp
+++ b/test/JsonParser_Object_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class JsonParser_Object_Test : public testing::Test {
  protected:
@@ -15,11 +15,17 @@ class JsonParser_Object_Test : public testing::Test {
     _object = &_jsonBuffer.parseObject(_jsonString);
   }
 
-  void parseMustSucceed() { EXPECT_TRUE(_object->success()); }
+  void parseMustSucceed() {
+    EXPECT_TRUE(_object->success());
+  }
 
-  void parseMustFail() { EXPECT_FALSE(_object->success()); }
+  void parseMustFail() {
+    EXPECT_FALSE(_object->success());
+  }
 
-  void sizeMustBe(int expected) { EXPECT_EQ(expected, _object->size()); }
+  void sizeMustBe(int expected) {
+    EXPECT_EQ(expected, _object->size());
+  }
 
   void keyMustHaveValue(const char *key, const char *expected) {
     EXPECT_STREQ(expected, (*_object)[key]);
diff --git a/test/JsonParser_Variant_Tests.cpp b/test/JsonParser_Variant_Tests.cpp
index e8489263..4cdc6ed1 100644
--- a/test/JsonParser_Variant_Tests.cpp
+++ b/test/JsonParser_Variant_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonVariant_As_Tests.cpp b/test/JsonVariant_As_Tests.cpp
index 144f2b09..32497a21 100644
--- a/test/JsonVariant_As_Tests.cpp
+++ b/test/JsonVariant_As_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonVariant_Comparison_Tests.cpp b/test/JsonVariant_Comparison_Tests.cpp
index e6030171..9623c84c 100644
--- a/test/JsonVariant_Comparison_Tests.cpp
+++ b/test/JsonVariant_Comparison_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonVariant_Copy_Tests.cpp b/test/JsonVariant_Copy_Tests.cpp
index 75b96752..2acf66f4 100644
--- a/test/JsonVariant_Copy_Tests.cpp
+++ b/test/JsonVariant_Copy_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class JsonVariant_Copy_Tests : public ::testing::Test {
  protected:
diff --git a/test/JsonVariant_Is_Tests.cpp b/test/JsonVariant_Is_Tests.cpp
index b8f1e7b4..9644892a 100644
--- a/test/JsonVariant_Is_Tests.cpp
+++ b/test/JsonVariant_Is_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonVariant_PrintTo_Tests.cpp b/test/JsonVariant_PrintTo_Tests.cpp
index ef6d055b..70d0459a 100644
--- a/test/JsonVariant_PrintTo_Tests.cpp
+++ b/test/JsonVariant_PrintTo_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 #include <limits>
 
 class JsonVariant_PrintTo_Tests : public testing::Test {
@@ -21,7 +21,9 @@ class JsonVariant_PrintTo_Tests : public testing::Test {
   }
 };
 
-TEST_F(JsonVariant_PrintTo_Tests, Empty) { outputMustBe(""); }
+TEST_F(JsonVariant_PrintTo_Tests, Empty) {
+  outputMustBe("");
+}
 
 TEST_F(JsonVariant_PrintTo_Tests, Null) {
   variant = static_cast<char *>(0);
diff --git a/test/JsonVariant_Storage_Tests.cpp b/test/JsonVariant_Storage_Tests.cpp
index 672ddd94..07d3d6c6 100644
--- a/test/JsonVariant_Storage_Tests.cpp
+++ b/test/JsonVariant_Storage_Tests.cpp
@@ -1,14 +1,14 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
+#include <ArduinoJson.h>
 #include <gtest/gtest.h>
 #include <stdint.h>
 #include <limits>
-#include <ArduinoJson.h>
 
 class JsonVariant_Storage_Tests : public ::testing::Test {
  protected:
@@ -43,36 +43,84 @@ TEST_F(JsonVariant_Storage_Tests, SizeOfJsonInteger) {
 }
 #endif
 
-TEST_F(JsonVariant_Storage_Tests, Null) { testValue<const char *>(NULL); }
-TEST_F(JsonVariant_Storage_Tests, String) { testValue<const char *>("hello"); }
+TEST_F(JsonVariant_Storage_Tests, Null) {
+  testValue<const char *>(NULL);
+}
+TEST_F(JsonVariant_Storage_Tests, String) {
+  testValue<const char *>("hello");
+}
 
-TEST_F(JsonVariant_Storage_Tests, False) { testValue<bool>(false); }
-TEST_F(JsonVariant_Storage_Tests, True) { testValue<bool>(true); }
+TEST_F(JsonVariant_Storage_Tests, False) {
+  testValue<bool>(false);
+}
+TEST_F(JsonVariant_Storage_Tests, True) {
+  testValue<bool>(true);
+}
 
-TEST_F(JsonVariant_Storage_Tests, Double) { testNumericType<double>(); }
-TEST_F(JsonVariant_Storage_Tests, Float) { testNumericType<float>(); }
-TEST_F(JsonVariant_Storage_Tests, SChar) { testNumericType<signed char>(); }
-TEST_F(JsonVariant_Storage_Tests, SInt) { testNumericType<signed int>(); }
-TEST_F(JsonVariant_Storage_Tests, SLong) { testNumericType<signed long>(); }
-TEST_F(JsonVariant_Storage_Tests, SShort) { testNumericType<signed short>(); }
-TEST_F(JsonVariant_Storage_Tests, UChar) { testNumericType<unsigned char>(); }
-TEST_F(JsonVariant_Storage_Tests, UInt) { testNumericType<unsigned int>(); }
-TEST_F(JsonVariant_Storage_Tests, ULong) { testNumericType<unsigned long>(); }
-TEST_F(JsonVariant_Storage_Tests, UShort) { testNumericType<unsigned short>(); }
+TEST_F(JsonVariant_Storage_Tests, Double) {
+  testNumericType<double>();
+}
+TEST_F(JsonVariant_Storage_Tests, Float) {
+  testNumericType<float>();
+}
+TEST_F(JsonVariant_Storage_Tests, SChar) {
+  testNumericType<signed char>();
+}
+TEST_F(JsonVariant_Storage_Tests, SInt) {
+  testNumericType<signed int>();
+}
+TEST_F(JsonVariant_Storage_Tests, SLong) {
+  testNumericType<signed long>();
+}
+TEST_F(JsonVariant_Storage_Tests, SShort) {
+  testNumericType<signed short>();
+}
+TEST_F(JsonVariant_Storage_Tests, UChar) {
+  testNumericType<unsigned char>();
+}
+TEST_F(JsonVariant_Storage_Tests, UInt) {
+  testNumericType<unsigned int>();
+}
+TEST_F(JsonVariant_Storage_Tests, ULong) {
+  testNumericType<unsigned long>();
+}
+TEST_F(JsonVariant_Storage_Tests, UShort) {
+  testNumericType<unsigned short>();
+}
 #if ARDUINOJSON_USE_LONG_LONG || ARDUINOJSON_USE_INT64
-TEST_F(JsonVariant_Storage_Tests, LongLong) { testNumericType<unsigned long long>(); }
-TEST_F(JsonVariant_Storage_Tests, ULongLong) { testNumericType<unsigned long long>(); }
+TEST_F(JsonVariant_Storage_Tests, LongLong) {
+  testNumericType<unsigned long long>();
+}
+TEST_F(JsonVariant_Storage_Tests, ULongLong) {
+  testNumericType<unsigned long long>();
+}
 #endif
 
-TEST_F(JsonVariant_Storage_Tests, Int8) { testNumericType<int8_t>(); }
-TEST_F(JsonVariant_Storage_Tests, Uint8) { testNumericType<uint8_t>(); }
-TEST_F(JsonVariant_Storage_Tests, Int16) { testNumericType<int16_t>(); }
-TEST_F(JsonVariant_Storage_Tests, Uint16) { testNumericType<uint16_t>(); }
-TEST_F(JsonVariant_Storage_Tests, Int32) { testNumericType<int32_t>(); }
-TEST_F(JsonVariant_Storage_Tests, Uint32) { testNumericType<uint32_t>(); }
+TEST_F(JsonVariant_Storage_Tests, Int8) {
+  testNumericType<int8_t>();
+}
+TEST_F(JsonVariant_Storage_Tests, Uint8) {
+  testNumericType<uint8_t>();
+}
+TEST_F(JsonVariant_Storage_Tests, Int16) {
+  testNumericType<int16_t>();
+}
+TEST_F(JsonVariant_Storage_Tests, Uint16) {
+  testNumericType<uint16_t>();
+}
+TEST_F(JsonVariant_Storage_Tests, Int32) {
+  testNumericType<int32_t>();
+}
+TEST_F(JsonVariant_Storage_Tests, Uint32) {
+  testNumericType<uint32_t>();
+}
 #if ARDUINOJSON_USE_LONG_LONG || ARDUINOJSON_USE_INT64
-TEST_F(JsonVariant_Storage_Tests, Int64) { testNumericType<int64_t>(); }
-TEST_F(JsonVariant_Storage_Tests, Uint64) { testNumericType<uint64_t>(); }
+TEST_F(JsonVariant_Storage_Tests, Int64) {
+  testNumericType<int64_t>();
+}
+TEST_F(JsonVariant_Storage_Tests, Uint64) {
+  testNumericType<uint64_t>();
+}
 #endif
 
 TEST_F(JsonVariant_Storage_Tests, CanStoreObject) {
diff --git a/test/JsonVariant_Subscript_Tests.cpp b/test/JsonVariant_Subscript_Tests.cpp
index 7bbcd8dd..cf812d79 100644
--- a/test/JsonVariant_Subscript_Tests.cpp
+++ b/test/JsonVariant_Subscript_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonVariant_Success_Tests.cpp b/test/JsonVariant_Success_Tests.cpp
index 5a8d7b34..b56c1bcb 100644
--- a/test/JsonVariant_Success_Tests.cpp
+++ b/test/JsonVariant_Success_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonVariant_Undefined_Tests.cpp b/test/JsonVariant_Undefined_Tests.cpp
index 05c66c95..d432c4bf 100644
--- a/test/JsonVariant_Undefined_Tests.cpp
+++ b/test/JsonVariant_Undefined_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class JsonVariant_Undefined_Tests : public ::testing::Test {
  protected:
diff --git a/test/JsonWriter_WriteFloat_Tests.cpp b/test/JsonWriter_WriteFloat_Tests.cpp
index 944bc09a..a8eeb8f3 100644
--- a/test/JsonWriter_WriteFloat_Tests.cpp
+++ b/test/JsonWriter_WriteFloat_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/JsonWriter_WriteString_Tests.cpp b/test/JsonWriter_WriteString_Tests.cpp
index 96ea9cfc..3e9c2a66 100644
--- a/test/JsonWriter_WriteString_Tests.cpp
+++ b/test/JsonWriter_WriteString_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/StaticJsonBuffer_Basic_Tests.cpp b/test/StaticJsonBuffer_Basic_Tests.cpp
index 116784f8..29edc824 100644
--- a/test/StaticJsonBuffer_Basic_Tests.cpp
+++ b/test/StaticJsonBuffer_Basic_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class StaticJsonBuffer_Basic_Tests : public testing::Test {
  protected:
diff --git a/test/StaticJsonBuffer_CreateArray_Tests.cpp b/test/StaticJsonBuffer_CreateArray_Tests.cpp
index 1781b98f..1135305d 100644
--- a/test/StaticJsonBuffer_CreateArray_Tests.cpp
+++ b/test/StaticJsonBuffer_CreateArray_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 TEST(StaticJsonBuffer_CreateArray_Tests, GrowsWithArray) {
   StaticJsonBuffer<JSON_ARRAY_SIZE(2)> json;
diff --git a/test/StaticJsonBuffer_CreateObject_Tests.cpp b/test/StaticJsonBuffer_CreateObject_Tests.cpp
index 05cdcb87..d1ce13a8 100644
--- a/test/StaticJsonBuffer_CreateObject_Tests.cpp
+++ b/test/StaticJsonBuffer_CreateObject_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 TEST(StaticJsonBuffer_CreateObject_Tests, GrowsWithObject) {
   StaticJsonBuffer<JSON_OBJECT_SIZE(3)> buffer;
diff --git a/test/StaticJsonBuffer_ParseArray_Tests.cpp b/test/StaticJsonBuffer_ParseArray_Tests.cpp
index 4f358f2c..7c7f1c79 100644
--- a/test/StaticJsonBuffer_ParseArray_Tests.cpp
+++ b/test/StaticJsonBuffer_ParseArray_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/StaticJsonBuffer_ParseObject_Tests.cpp b/test/StaticJsonBuffer_ParseObject_Tests.cpp
index 8b8c2fb7..855ae08c 100644
--- a/test/StaticJsonBuffer_ParseObject_Tests.cpp
+++ b/test/StaticJsonBuffer_ParseObject_Tests.cpp
@@ -1,12 +1,12 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 // If you like this project, please add a star!
 
-#include <gtest/gtest.h>
 #include <ArduinoJson.h>
+#include <gtest/gtest.h>
 
 class StaticJsonBuffer_ParseObject_Tests : public testing::Test {
  protected:
diff --git a/test/StaticJsonBuffer_String_Tests.cpp b/test/StaticJsonBuffer_String_Tests.cpp
index a4cb47fc..58e7738d 100644
--- a/test/StaticJsonBuffer_String_Tests.cpp
+++ b/test/StaticJsonBuffer_String_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/StdStream_Tests.cpp b/test/StdStream_Tests.cpp
index 1d3fe118..9c25bb05 100644
--- a/test/StdStream_Tests.cpp
+++ b/test/StdStream_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/StringBuilderTests.cpp b/test/StringBuilderTests.cpp
index c8aede9a..4ff8f0a8 100644
--- a/test/StringBuilderTests.cpp
+++ b/test/StringBuilderTests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
@@ -16,13 +16,21 @@ class StringBuilderTests : public testing::Test {
     _stringBuilder = new StaticStringBuilder(_buffer, sizeof(_buffer));
   }
 
-  virtual void TearDown() { delete _stringBuilder; }
+  virtual void TearDown() {
+    delete _stringBuilder;
+  }
 
-  void print(const char *value) { _returnValue = _stringBuilder->print(value); }
+  void print(const char *value) {
+    _returnValue = _stringBuilder->print(value);
+  }
 
-  void outputMustBe(const char *expected) { EXPECT_STREQ(expected, _buffer); }
+  void outputMustBe(const char *expected) {
+    EXPECT_STREQ(expected, _buffer);
+  }
 
-  void resultMustBe(size_t expected) { EXPECT_EQ(expected, _returnValue); }
+  void resultMustBe(size_t expected) {
+    EXPECT_EQ(expected, _returnValue);
+  }
 
  private:
   char _buffer[20];
@@ -30,7 +38,9 @@ class StringBuilderTests : public testing::Test {
   size_t _returnValue;
 };
 
-TEST_F(StringBuilderTests, InitialState) { outputMustBe(""); }
+TEST_F(StringBuilderTests, InitialState) {
+  outputMustBe("");
+}
 
 TEST_F(StringBuilderTests, OverCapacity) {
   print("ABCDEFGHIJKLMNOPQRSTUVWXYZ");
diff --git a/test/String_Tests.cpp b/test/String_Tests.cpp
index bd572853..19a15563 100644
--- a/test/String_Tests.cpp
+++ b/test/String_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library
diff --git a/test/TypeTraits_Tests.cpp b/test/TypeTraits_Tests.cpp
index 90b8da0f..653df8d8 100644
--- a/test/TypeTraits_Tests.cpp
+++ b/test/TypeTraits_Tests.cpp
@@ -1,4 +1,4 @@
-// Copyright Benoit Blanchon 2014-2016
+// Copyright Benoit Blanchon 2014-2017
 // MIT License
 //
 // Arduino JSON library