diff --git a/include/ArduinoJson.h b/include/ArduinoJson.h
index d02a1739..95a5e347 100644
--- a/include/ArduinoJson.h
+++ b/include/ArduinoJson.h
@@ -4,6 +4,7 @@
 // Arduino JSON library
 // https://github.com/bblanchon/ArduinoJson
 
+#include "../include/ArduinoJson/DynamicJsonBuffer.hpp"
 #include "../include/ArduinoJson/JsonArray.hpp"
 #include "../include/ArduinoJson/JsonObject.hpp"
 #include "../include/ArduinoJson/StaticJsonBuffer.hpp"
diff --git a/test/DynamicJsonBuffer_Array_Tests.cpp b/test/DynamicJsonBuffer_Array_Tests.cpp
new file mode 100644
index 00000000..7c620475
--- /dev/null
+++ b/test/DynamicJsonBuffer_Array_Tests.cpp
@@ -0,0 +1,32 @@
+// Copyright Benoit Blanchon 2014
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+
+#include <gtest/gtest.h>
+#include <ArduinoJson.h>
+
+TEST(DynamicJsonBuffer_Array_Tests, GrowsWithArray) {
+  DynamicJsonBuffer jsonBuffer;
+
+  JsonArray &array = jsonBuffer.createArray();
+  ASSERT_EQ(JSON_ARRAY_SIZE(0), jsonBuffer.size());
+
+  array.add("hello");
+  ASSERT_EQ(JSON_ARRAY_SIZE(1), jsonBuffer.size());
+
+  array.add("world");
+  ASSERT_EQ(JSON_ARRAY_SIZE(2), jsonBuffer.size());
+}
+
+TEST(DynamicJsonBuffer_Array_Tests, CanAdd1000Values) {
+  DynamicJsonBuffer jsonBuffer;
+
+  JsonArray &array = jsonBuffer.createArray();
+
+  for (int i = 1; i <= 1000; i++) {
+    array.add("hello");
+    ASSERT_EQ(array.size(), i);
+  }
+}