diff --git a/examples/z1/test-tmp102.c b/examples/z1/test-tmp102.c
new file mode 100644
index 000000000..6b25221a3
--- /dev/null
+++ b/examples/z1/test-tmp102.c
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2007, Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * This file is part of the Contiki operating system.
+ *
+ */
+
+/**
+ * \file
+ *         A quick program for testing the tmp102 driver
+ * \author
+ *         Enric Calvo <ecalvo@zolertia.com>
+ */
+
+#include <stdio.h>
+#include "contiki.h"
+#include "dev/i2cmaster.h"
+#include "dev/tmp102.h"
+
+
+#if 1
+#define PRINTF(...) printf(__VA_ARGS__)
+#else
+#define PRINTF(...)
+#endif
+
+
+#if 0
+#define PRINTFDEBUG(...) printf(__VA_ARGS__)
+#else
+#define PRINTFDEBUG(...)
+#endif
+
+
+#define TMP102_READ_INTERVAL (CLOCK_SECOND/2)
+
+PROCESS (temp_process, "Test Temperature process");
+AUTOSTART_PROCESSES (&temp_process);
+/*---------------------------------------------------------------------------*/
+static struct etimer et;
+
+PROCESS_THREAD (temp_process, ev, data)
+{
+  PROCESS_BEGIN ();
+
+  {
+    int16_t  tempint;
+    uint16_t tempfrac;
+    int16_t  raw;
+    uint16_t absraw;
+    int16_t  sign;
+    char     minus = ' ';
+
+    tmp102_init();
+
+    while (1)
+      {
+        etimer_set(&et, TMP102_READ_INTERVAL);
+        PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&et));
+
+        sign = 1;
+
+	PRINTFDEBUG ("Reading Temp...\n");
+	raw = tmp102_read_temp_raw();
+        absraw = raw;
+        if (raw < 0) { // Perform 2C's if sensor returned negative data
+          absraw = (raw ^ 0xFFFF) + 1;
+          sign = -1;
+        }
+	tempint  = (absraw >> 8) * sign;
+        tempfrac = ((absraw>>4) % 16) * 625; // Info in 1/10000 of degree
+        minus = ((tempint == 0) & (sign == -1)) ? '-'  : ' ' ;
+	PRINTF ("Temp = %c%d.%04d\n", minus, tempint, tempfrac);
+      }
+  }
+  PROCESS_END ();
+}
+