diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a4e683e..f36591ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ v5.0.6
 
 * Added parameter to `DynamicJsonBuffer` constructor to set initial size (issue #152)
 * Fixed warning about library category in Arduino 1.6.6 (issue #147)
+* Examples: Added a loop to wait for serial port to be ready (issue #156)
 
 v5.0.5
 ------
diff --git a/examples/IndentedPrintExample/IndentedPrintExample.ino b/examples/IndentedPrintExample/IndentedPrintExample.ino
index c5fa6afa..4c7cd33a 100644
--- a/examples/IndentedPrintExample/IndentedPrintExample.ino
+++ b/examples/IndentedPrintExample/IndentedPrintExample.ino
@@ -10,7 +10,9 @@ using namespace ArduinoJson::Internals;
 
 void setup() {
   Serial.begin(9600);
-  // delay(1000); <--needed for some boards (like Teensy)
+  while (!Serial) {
+    // wait serial port initialization
+  }
 
   IndentedPrint serial(Serial);
   serial.setTabSize(4);
diff --git a/examples/JsonGeneratorExample/JsonGeneratorExample.ino b/examples/JsonGeneratorExample/JsonGeneratorExample.ino
index 6d2fbb4f..52076ee6 100644
--- a/examples/JsonGeneratorExample/JsonGeneratorExample.ino
+++ b/examples/JsonGeneratorExample/JsonGeneratorExample.ino
@@ -8,7 +8,9 @@
 
 void setup() {
   Serial.begin(9600);
-  // delay(1000); <--needed for some boards (like Teensy)
+  while (!Serial) {
+    // wait serial port initialization
+  }
 
   StaticJsonBuffer<200> jsonBuffer;
 
diff --git a/examples/JsonParserExample/JsonParserExample.ino b/examples/JsonParserExample/JsonParserExample.ino
index 1739b40c..33a472ec 100644
--- a/examples/JsonParserExample/JsonParserExample.ino
+++ b/examples/JsonParserExample/JsonParserExample.ino
@@ -8,7 +8,9 @@
 
 void setup() {
   Serial.begin(9600);
-  // delay(1000); <--needed for some boards (like Teensy)
+  while (!Serial) {
+    // wait serial port initialization
+  }
 
   StaticJsonBuffer<200> jsonBuffer;