diff --git a/.travis.yml b/.travis.yml
index 858141d92..70a3dd42e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,15 @@
 sudo: false
 language: cpp
+cache:
+  directories:
+    - "~/.platformio"
 env:
   - COMPILER=gcc
   - COMPILER=clang
   - COMPILER=arduino VERSION=1.5.8 BOARD=arduino:avr:uno
   - COMPILER=arduino VERSION=1.6.7 BOARD=arduino:avr:uno
+  - COMPILER=platformio BOARD=uno
+  - COMPILER=platformio BOARD=due
+  - COMPILER=platformio BOARD=esp01
+  - COMPILER=platformio BOARD=teensy31
 script: scripts/travis/$COMPILER.sh
diff --git a/ArduinoJson.h b/ArduinoJson.h
new file mode 100644
index 000000000..6b176c8cd
--- /dev/null
+++ b/ArduinoJson.h
@@ -0,0 +1,14 @@
+// Copyright Benoit Blanchon 2014-2015
+// MIT License
+//
+// Arduino JSON library
+// https://github.com/bblanchon/ArduinoJson
+
+// About this file
+// ---------------
+// This file is here to please the platform.io compile. It must be present in
+// the root for the IDE to find it. Feel free to ignore this file if your
+// working in another environment.
+// ...and yes this is driving me crazy!
+
+#include "include/ArduinoJson.h"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a61448bb..4aea3f5fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 ArduinoJson: change log
 =======================
 
+HEAD
+----
+
+* Made the library compatible with platform.io (issue #181)
+
 v5.0.7
 ------
 
diff --git a/library.json b/library.json
index 608f5e79a..59fb5879b 100644
--- a/library.json
+++ b/library.json
@@ -2,16 +2,20 @@
   "name": "Json",
   "keywords": "json, rest, http, web",
   "description": "An elegant and efficient JSON library for embedded systems",
-  "repository":
-  {
+  "repository": {
     "type": "git",
     "url": "https://github.com/bblanchon/ArduinoJson.git"
   },
-  "authors":
-  {
+  "authors": {
     "name": "Benoit Blanchon",
     "url": "http://blog.benoitblanchon.fr"
   },
+  "exclude": [
+    "scripts",
+    "src/ArduinoJson.h",
+    "test",
+    "third-party"
+  ],
   "frameworks": "arduino",
-  "platforms": "atmelavr"  
-}
\ No newline at end of file
+  "platforms": "*"
+}
diff --git a/scripts/travis/platformio.sh b/scripts/travis/platformio.sh
new file mode 100755
index 000000000..5831129cb
--- /dev/null
+++ b/scripts/travis/platformio.sh
@@ -0,0 +1,10 @@
+#!/bin/sh -eux
+
+pip install --user platformio
+
+rm -r test
+
+for EXAMPLE in JsonParserExample JsonGeneratorExample
+do
+	platformio ci examples/$EXAMPLE/$EXAMPLE.ino -l '.' -b $BOARD
+done