diff --git a/.travis.yml b/.travis.yml
index cf3a4628..8978a8e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,5 +18,5 @@ before_script:
 - mkdir -p ${ARDUINO_HOME}/libraries
 - ( cd ${ARDUINO_HOME}/libraries && ln -s ${TRAVIS_BUILD_DIR} firebase-arduino && ln -s ${TRAVIS_BUILD_DIR}/src/third-party/arduino-json-5.2 ArduinoJson )
 script:
-- ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebasePush_ESP8266/FirebasePush_ESP8266.ino
+- ${ARDUINO_ROOT}/arduino-builder -verbose  -hardware ${ARDUINO_ROOT}/hardware/ -tools ${ARDUINO_ESP8266_ROOT}/tools/ -tools ${ARDUINO_ROOT}/tools-builder/ -fqbn esp8266com:esp8266:nodemcuv2 -libraries ${ARDUINO_HOME}/libraries/ -prefs build.flash_ld=${ARDUINO_ESP8266_ROOT}/tools/sdk/ld/eagle.flash.4m.ld -prefs build.flash_freq=40 -prefs build.flash_size=4M examples/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino
 - cd test && make check
diff --git a/examples/FirebasePush_ESP8266/FirebasePush_ESP8266.ino b/examples/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino
similarity index 58%
rename from examples/FirebasePush_ESP8266/FirebasePush_ESP8266.ino
rename to examples/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino
index 34c5eb5c..93bb3436 100644
--- a/examples/FirebasePush_ESP8266/FirebasePush_ESP8266.ino
+++ b/examples/FirebaseDemo_ESP8266/FirebaseDemo_ESP8266.ino
@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-// FirebasePush_ESP8266 is a sample that push a new value to Firebase
-// every seconds.
+// FirebaseDemo_ESP8266 is a sample that demo the different functions
+// of the FirebaseArduino API.
 
 #include <ESP8266WiFi.h>
 #include <FirebaseArduino.h>
@@ -34,20 +34,45 @@ void setup() {
   Serial.print("connected: ");
   Serial.println(WiFi.localIP());
   
-  Firebase.begin("example.firebaseio.com", "auth_or_token");
+  Firebase.begin("example.firebaseio.com", "token_or_secret");
 }
 
 int n = 0;
 
 void loop() {
-  // push a new value.
-  String name = Firebase.push("/logs", n++);
+  // set value
+  Firebase.set("number", 42.0);
+  // handle error
   if (Firebase.failed()) {
-      Serial.print("push failed: ");
+      Serial.print("setting /number failed:");
       Serial.println(Firebase.error());  
       return;
   }
-  Serial.print("pushed: ");
+  delay(1000);
+  
+  // update value
+  Firebase.set("number", 43.0);
+  delay(1000);
+
+  // get value 
+  Serial.print("number: ");
+  Serial.println((float)Firebase.get("number"));
+  delay(1000);
+
+  // remove value
+  Firebase.remove("number");
+  delay(1000);
+
+  // set string value
+  Firebase.set("message", "hello world");
+  delay(1000);
+  // set bool value
+  Firebase.set("truth", false);
+  delay(1000);
+
+  // append a new value to /logs
+  String name = Firebase.push("logs", n++);
+  Serial.print("pushed: /logs/");
   Serial.println(name);
   delay(1000);
 }