diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..986479b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,28 @@
+language: c
+before_install:
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16"
+  - sleep 3
+  - export DISPLAY=:1.0
+  - wget http://downloads.arduino.cc/arduino-1.8.7-linux64.tar.xz
+  - tar xf arduino-1.8.7-linux64.tar.xz
+  - sudo mv arduino-1.8.7 /usr/local/share/arduino
+  - sudo ln -s /usr/local/share/arduino/arduino /usr/local/bin/arduino
+install:
+  - ln -s $PWD /usr/local/share/arduino/libraries/WEMOS_SHT3x_Arduino_Library
+  - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs
+  - arduino --install-library "Adafruit GFX Library"
+  - arduino --install-library "Adafruit SSD1306"
+  - arduino --install-boards esp8266:esp8266
+  - arduino --board esp8266:esp8266:generic:CpuFrequency=80,VTable=flash,FlashFreq=40,FlashMode=qio,FlashSize=512K0,led=2 --save-prefs
+  - arduino --get-pref
+script:
+  - "echo $PWD"
+  - "echo $HOME"
+  - "ls $PWD"
+  - arduino --verify $PWD/examples/SHT30_Shield/SHT30_Shield.ino
+  # test the main target board, that is Lolin D1 Mini
+  - arduino --verify --board esp8266:esp8266:d1_mini:CpuFrequency=80,FlashSize=4M1M $PWD/examples/SHT30_Shield/SHT30_Shield.ino
+notifications:
+  email:
+    on_success: change
+    on_failure: change
\ No newline at end of file
diff --git a/README.md b/README.md
index c6ab6d7..6527191 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# Arduino library for the WEMOS SHT30 Shiled
+# Arduino library for the WEMOS SHT30 Shield [![Build Status](https://travis-ci.org/fabiuz7/WEMOS_SHT3x_Arduino_Library.svg?branch=master)](https://travis-ci.org/fabiuz7/WEMOS_SHT3x_Arduino_Library)
 
-### Installation
+### Installation [![Latest release](https://img.shields.io/github/release/fabiuz7/WEMOS_SHT3x_Arduino_Library.svg)](https://github.com/fabiuz7/WEMOS_SHT3x_Arduino_Library/releases/latest/)
 - Clone this repository  or download&unzip [zip file](https://github.com/wemos/WEMOS_SHT3x_Arduino_Library/archive/master.zip) into Arduino/libraries
 
diff --git a/src/WEMOS_SHT3X.cpp b/src/WEMOS_SHT3X.cpp
index de45b11..be10ace 100644
--- a/src/WEMOS_SHT3X.cpp
+++ b/src/WEMOS_SHT3X.cpp
@@ -24,7 +24,9 @@ byte SHT3X::get()
 	if (Wire.endTransmission()!=0) 
 		return 1;  
 
-	delay(500);
+	// From the datasheet, this is the max time needed to read
+	// temp and hum at "high repeability" mode
+	delay(15);
 
 	// Request 6 bytes of data
 	Wire.requestFrom(_address, 6);
@@ -35,8 +37,8 @@ byte SHT3X::get()
 		data[i]=Wire.read();
 	};
 	
-	delay(50);
-	
+	// No need to wait again, the last "bit" (NACK) has been already received
+
 	if (Wire.available()!=0) 
 		return 2;