diff --git a/Makefile b/Makefile
index 4923b20..e7b81d7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,163 +1,165 @@
-# tnx to mamalala
-# Changelog
-# Changed the variables to include the header file directory
-# Added global var for the XTENSA tool root
-#
-# This make file still needs some work.
-#
-#
-# Output directors to store intermediate compiled files
-# relative to the project directory
-BUILD_BASE	= build
-FW_BASE		= firmware
-
-# Base directory for the compiler
-XTENSA_TOOLS_ROOT ?= /opt/Espressif/crosstool-NG/builds/xtensa-lx106-elf/bin
-
-#Extra Tensilica includes from the ESS VM
-SDK_EXTRA_INCLUDES ?= /opt/Espressif/include
-
-# base directory of the ESP8266 SDK package, absolute
-SDK_BASE	?= /opt/Espressif/ESP8266_SDK
-
-#Esptool.py path and port
-ESPTOOL		?= esptool.py
-ESPPORT		?= /dev/ttyUSB0
-
-# name for the target project
-TARGET		= httpd
-
-# which modules (subdirectories) of the project to include in compiling
-MODULES		= driver user
-EXTRA_INCDIR	= include \
-		. \
-		lib/heatshrink/ \
-		$(SDK_EXTRA_INCLUDES)
-
-# libraries used in this project, mainly provided by the SDK
-LIBS		= c gcc hal phy net80211 lwip wpa main
-
-# compiler flags using during compilation of source files
-CFLAGS		= -Os -ggdb -std=c99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals  -D__ets__ -DICACHE_FLASH
-
-# linker flags used to generate the main object file
-LDFLAGS		= -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static
-
-# linker script used for the above linkier step
-LD_SCRIPT	= eagle.app.v6.ld
-
-# various paths from the SDK used in this project
-SDK_LIBDIR	= lib
-SDK_LDDIR	= ld
-SDK_INCDIR	= include include/json
-
-# we create two different files for uploading into the flash
-# these are the names and options to generate them
-FW_FILE_1	= 0x00000
-FW_FILE_1_ARGS	= -bo $@ -bs .text -bs .data -bs .rodata -bc -ec
-FW_FILE_2	= 0x40000
-FW_FILE_2_ARGS	= -es .irom0.text $@ -ec
-
-# select which tools to use as compiler, librarian and linker
-CC		:= $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-gcc
-AR		:= $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-ar
-LD		:= $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-gcc
-
-
-
-####
-#### no user configurable options below here
-####
-FW_TOOL		?= /usr/bin/esptool
-SRC_DIR		:= $(MODULES)
-BUILD_DIR	:= $(addprefix $(BUILD_BASE)/,$(MODULES))
-
-SDK_LIBDIR	:= $(addprefix $(SDK_BASE)/,$(SDK_LIBDIR))
-SDK_INCDIR	:= $(addprefix -I$(SDK_BASE)/,$(SDK_INCDIR))
-
-SRC		:= $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.c))
-OBJ		:= $(patsubst %.c,$(BUILD_BASE)/%.o,$(SRC))
-LIBS		:= $(addprefix -l,$(LIBS))
-APP_AR		:= $(addprefix $(BUILD_BASE)/,$(TARGET)_app.a)
-TARGET_OUT	:= $(addprefix $(BUILD_BASE)/,$(TARGET).out)
-
-LD_SCRIPT	:= $(addprefix -T$(SDK_BASE)/$(SDK_LDDIR)/,$(LD_SCRIPT))
-
-INCDIR	:= $(addprefix -I,$(SRC_DIR))
-EXTRA_INCDIR	:= $(addprefix -I,$(EXTRA_INCDIR))
-MODULE_INCDIR	:= $(addsuffix /include,$(INCDIR))
-
-FW_FILE_1	:= $(addprefix $(FW_BASE)/,$(FW_FILE_1).bin)
-FW_FILE_2	:= $(addprefix $(FW_BASE)/,$(FW_FILE_2).bin)
-
-V ?= $(VERBOSE)
-ifeq ("$(V)","1")
-Q :=
-vecho := @true
-else
-Q := @
-vecho := @echo
-endif
-
-vpath %.c $(SRC_DIR)
-
-define compile-objects
-$1/%.o: %.c
-	$(vecho) "CC $$<"
-	$(Q) $(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS)  -c $$< -o $$@
-endef
-
-.PHONY: all checkdirs clean
-
-all: checkdirs $(TARGET_OUT) $(FW_FILE_1) $(FW_FILE_2)
-
-$(FW_FILE_1): $(TARGET_OUT) firmware
-	$(vecho) "FW $@"
-	$(Q) $(FW_TOOL) -eo $(TARGET_OUT) $(FW_FILE_1_ARGS)
-
-$(FW_FILE_2): $(TARGET_OUT) firmware
-	$(vecho) "FW $@"
-	$(Q) $(FW_TOOL) -eo $(TARGET_OUT) $(FW_FILE_2_ARGS)
-
-$(TARGET_OUT): $(APP_AR)
-	$(vecho) "LD $@"
-	$(Q) $(LD) -L$(SDK_LIBDIR) $(LD_SCRIPT) $(LDFLAGS) -Wl,--start-group $(LIBS) $(APP_AR) -Wl,--end-group -o $@
-
-$(APP_AR): $(OBJ)
-	$(vecho) "AR $@"
-	$(Q) $(AR) cru $@ $^
-
-checkdirs: $(BUILD_DIR) $(FW_BASE)
-
-$(BUILD_DIR):
-	$(Q) mkdir -p $@
-
-firmware:
-	$(Q) mkdir -p $@
-
-flash: $(FW_FILE_1) $(FW_FILE_2)
-	-$(ESPTOOL) --port $(ESPPORT) write_flash 0x00000 firmware/0x00000.bin
-	sleep 3
-	-$(ESPTOOL) --port $(ESPPORT) write_flash 0x40000 firmware/0x40000.bin
-
-webpages.espfs: html/ mkespfsimage/mkespfsimage
-	cd html; find | ../mkespfsimage/mkespfsimage  > ../webpages.espfs; cd ..
-
-mkespfsimage/mkespfsimage: mkespfsimage/
-	make -C mkespfsimage
-
-htmlflash: webpages.espfs
-	if [ $$(stat -c '%s' webpages.espfs) -gt $$(( 0x2E000 )) ]; then echo "webpages.espfs too big!"; false; fi
-	-$(ESPTOOL) --port $(ESPPORT) write_flash 0x12000 webpages.espfs
-
-clean:
-	$(Q) rm -f $(APP_AR)
-	$(Q) rm -f $(TARGET_OUT)
-	$(Q) find $(BUILD_BASE) -type f | xargs rm -f
-
-
-	$(Q) rm -f $(FW_FILE_1)
-	$(Q) rm -f $(FW_FILE_2)
-	$(Q) rm -rf $(FW_BASE)
-
-$(foreach bdir,$(BUILD_DIR),$(eval $(call compile-objects,$(bdir))))
+# tnx to mamalala
+# Changelog
+# Changed the variables to include the header file directory
+# Added global var for the XTENSA tool root
+#
+# This make file still needs some work.
+#
+#
+# Output directors to store intermediate compiled files
+# relative to the project directory
+BUILD_BASE	= build
+FW_BASE		= firmware
+
+# Base directory for the compiler
+XTENSA_TOOLS_ROOT ?= /opt/xtensa-lx106-elf/bin
+
+#Extra Tensilica includes from the ESS VM
+SDK_EXTRA_INCLUDES ?= /opt/Espressif/include
+
+# base directory of the ESP8266 SDK package, absolute
+SDK_BASE	?=/home/esp8266/Share/esp_iot_sdk
+
+#Esptool.py path and port
+ESPTOOL		?= /home/esp8266/Share/esp_iot_sdk/esptool.py
+ESPPORT		?= /dev/ttyUSB0
+
+# name for the target project
+TARGET		= httpd
+
+# which modules (subdirectories) of the project to include in compiling
+MODULES		= driver user
+EXTRA_INCDIR	= include \
+		. \
+		lib/heatshrink/ \
+		$(SDK_EXTRA_INCLUDES)
+
+# libraries used in this project, mainly provided by the SDK
+LIBS		= c gcc hal phy net80211 lwip wpa main
+
+# compiler flags using during compilation of source files
+CFLAGS		= -Os -ggdb -std=c99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mtext-section-literals  -D__ets__ -DICACHE_FLASH
+
+# linker flags used to generate the main object file
+LDFLAGS		= -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static
+
+# linker script used for the above linkier step
+LD_SCRIPT	= eagle.app.v6.ld
+
+# various paths from the SDK used in this project
+SDK_LIBDIR	= lib
+SDK_LDDIR	= ld
+SDK_INCDIR	= include include/json
+
+# we create two different files for uploading into the flash
+# these are the names and options to generate them
+FW_FILE_1	= 0x00000
+FW_FILE_1_ARGS	= -bo $@ -bs .text -bs .data -bs .rodata -bc -ec
+FW_FILE_2	= 0x40000
+FW_FILE_2_ARGS	= -es .irom0.text $@ -ec
+FW_FILE_3	= webpages.espfs
+
+# select which tools to use as compiler, librarian and linker
+CC		:= $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-gcc
+AR		:= $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-ar
+LD		:= $(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-gcc
+
+
+
+####
+#### no user configurable options below here
+####
+FW_TOOL		?= /usr/bin/esptool
+SRC_DIR		:= $(MODULES)
+BUILD_DIR	:= $(addprefix $(BUILD_BASE)/,$(MODULES))
+
+SDK_LIBDIR	:= $(addprefix $(SDK_BASE)/,$(SDK_LIBDIR))
+SDK_INCDIR	:= $(addprefix -I$(SDK_BASE)/,$(SDK_INCDIR))
+
+SRC		:= $(foreach sdir,$(SRC_DIR),$(wildcard $(sdir)/*.c))
+OBJ		:= $(patsubst %.c,$(BUILD_BASE)/%.o,$(SRC))
+LIBS		:= $(addprefix -l,$(LIBS))
+APP_AR		:= $(addprefix $(BUILD_BASE)/,$(TARGET)_app.a)
+TARGET_OUT	:= $(addprefix $(BUILD_BASE)/,$(TARGET).out)
+
+LD_SCRIPT	:= $(addprefix -T$(SDK_BASE)/$(SDK_LDDIR)/,$(LD_SCRIPT))
+
+INCDIR	:= $(addprefix -I,$(SRC_DIR))
+EXTRA_INCDIR	:= $(addprefix -I,$(EXTRA_INCDIR))
+MODULE_INCDIR	:= $(addsuffix /include,$(INCDIR))
+
+FW_FILE_1	:= $(addprefix $(FW_BASE)/,$(FW_FILE_1).bin)
+FW_FILE_2	:= $(addprefix $(FW_BASE)/,$(FW_FILE_2).bin)
+
+V ?= $(VERBOSE)
+ifeq ("$(V)","1")
+Q :=
+vecho := @true
+else
+Q := @
+vecho := @echo
+endif
+
+vpath %.c $(SRC_DIR)
+
+define compile-objects
+$1/%.o: %.c
+	$(vecho) "CC $$<"
+	$(Q) $(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS)  -c $$< -o $$@
+endef
+
+.PHONY: all checkdirs clean
+
+all: checkdirs $(TARGET_OUT) $(FW_FILE_1) $(FW_FILE_2)
+
+$(FW_FILE_1): $(TARGET_OUT) firmware
+	$(vecho) "FW $@"
+	$(Q) $(FW_TOOL) -eo $(TARGET_OUT) $(FW_FILE_1_ARGS)
+
+$(FW_FILE_2): $(TARGET_OUT) firmware
+	$(vecho) "FW $@"
+	$(Q) $(FW_TOOL) -eo $(TARGET_OUT) $(FW_FILE_2_ARGS)
+
+$(TARGET_OUT): $(APP_AR)
+	$(vecho) "LD $@"
+	$(Q) $(LD) -L$(SDK_LIBDIR) $(LD_SCRIPT) $(LDFLAGS) -Wl,--start-group $(LIBS) $(APP_AR) -Wl,--end-group -o $@
+
+$(APP_AR): $(OBJ)
+	$(vecho) "AR $@"
+	$(Q) $(AR) cru $@ $^
+
+checkdirs: $(BUILD_DIR) $(FW_BASE)
+
+$(BUILD_DIR):
+	$(Q) mkdir -p $@
+
+firmware:
+	$(Q) mkdir -p $@
+
+flash: $(FW_FILE_1) $(FW_FILE_2)
+	-$(ESPTOOL) --port $(ESPPORT) write_flash 0x00000 firmware/0x00000.bin
+	sleep 10
+	-$(ESPTOOL) --port $(ESPPORT) write_flash 0x40000 firmware/0x40000.bin
+
+webpages.espfs: html/ mkespfsimage/mkespfsimage
+	cd html; find | ../mkespfsimage/mkespfsimage  > ../webpages.espfs; cd ..
+
+mkespfsimage/mkespfsimage: mkespfsimage/
+	make -C mkespfsimage
+
+htmlflash: webpages.espfs
+	if [ $$(stat -c '%s' webpages.espfs) -gt $$(( 0x2E000 )) ]; then echo "webpages.espfs too big!"; false; fi
+	-$(ESPTOOL) --port $(ESPPORT) write_flash 0x12000 webpages.espfs
+
+clean:
+	$(Q) rm -f $(APP_AR)
+	$(Q) rm -f $(TARGET_OUT)
+	$(Q) find $(BUILD_BASE) -type f | xargs rm -f
+
+
+	$(Q) rm -f $(FW_FILE_1)
+	$(Q) rm -f $(FW_FILE_2)
+	$(Q) rm -f $(FW_FILE_3)
+	$(Q) rm -rf $(FW_BASE)
+
+$(foreach bdir,$(BUILD_DIR),$(eval $(call compile-objects,$(bdir))))
diff --git a/html/cats/cross-eyed-cat.jpg b/html/cats/cross-eyed-cat.jpg
deleted file mode 100644
index e166e87..0000000
Binary files a/html/cats/cross-eyed-cat.jpg and /dev/null differ
diff --git a/html/cats/junge-katze-iv.jpg b/html/cats/junge-katze-iv.jpg
deleted file mode 100644
index c3cf70b..0000000
Binary files a/html/cats/junge-katze-iv.jpg and /dev/null differ
diff --git a/html/cats/kitten-loves-toy.jpg b/html/cats/kitten-loves-toy.jpg
deleted file mode 100644
index 569ff56..0000000
Binary files a/html/cats/kitten-loves-toy.jpg and /dev/null differ
diff --git a/html/dht22.tpl b/html/dht22.tpl
new file mode 100644
index 0000000..866c027
--- /dev/null
+++ b/html/dht22.tpl
@@ -0,0 +1,12 @@
+<html><head><title>DHT 22</title>
+<link rel="stylesheet" type="text/css" href="style.css">
+</head>
+<body>
+<div id="main">
+<h1>DHT 22 temperature/humidity sensor</h1>
+<p>
+If there's a DHT 22 connected to GPIO2, its temperature reading is %temperature%*C, humidity is %humidity% .
+</p>
+<button onclick="location.href = '/';" class="float-left submit-button" >Home</button>
+</div>
+</body></html>
diff --git a/html/index.tpl b/html/index.tpl
index 4310cb3..ec9e693 100644
--- a/html/index.tpl
+++ b/html/index.tpl
@@ -4,22 +4,15 @@
 </head>
 <body>
 <div id="main">
-<h1>It Works</h1>
+<h1>Main</h1>
 <p>
-If you see this, it means the tiny li'l website in your ESP8266 does actually work. Fyi, this page has
-been loaded <b>%counter%</b> times.
 <ul>
 <li>If you haven't connected this device to your WLAN network now, you can <a href="/wifi">do so.</a></li>
 <li>You can also control the <a href="led.tpl">LED</a>.</li>
+<li>..or view readings of <a href="dht22.tpl">DHT22</a> sensor.</li>
 <li>You can download the raw <a href="flash.bin">contents</a> of the SPI flash rom</li>
-<li>And because I can, here's a link to my <a href="http://spritesmods.com/?f=esphttpd">website</a></ul>
 </ul>
 </p>
-
-<p>And because we're on the Internets now, here are the required pictures of cats:<br />
-<img src="cats/cross-eyed-cat.jpg"><br />
-<img src="cats/junge-katze-iv.jpg"><br />
-<img src="cats/kitten-loves-toy.jpg"><br />
-</p>
+<p>Page has been loaded <b>%counter%</b> times.
 </div>
 </body></html>
diff --git a/html/led.tpl b/html/led.tpl
index 7a9cf89..6607ea3 100644
--- a/html/led.tpl
+++ b/html/led.tpl
@@ -1,15 +1,16 @@
-<html><head><title>Test</title>
+<html><head><title>LED</title>
 <link rel="stylesheet" type="text/css" href="style.css">
 </head>
 <body>
 <div id="main">
 <h1>The LED</h1>
 <p>
-If there's a LED connected to GPIO2, it's now %ledstate%. You can change that using the buttons below.
+If there's a LED connected to GPIO13, it's now %ledstate%. You can change that using the buttons below.
 </p>
-<form method="post" action="led.cgi">
+<form method="get" action="led.cgi">
 <input type="submit" name="led" value="1">
 <input type="submit" name="led" value="0">
 </form>
+<button onclick="location.href = '/';" class="float-left submit-button" >Home</button>
 </div>
 </body></html>
diff --git a/html/style.css b/html/style.css
index 5b6801c..72311e6 100644
--- a/html/style.css
+++ b/html/style.css
@@ -10,7 +10,7 @@ body {
 	-webkit-border-radius: 5px;
 	border-radius: 5px;
 	border: 2px solid #000000;
-	width: 800px;
+	width: 80%;
 	margin: 0 auto;
 	padding: 20px
 }
diff --git a/html/wifi/style.css b/html/wifi/style.css
deleted file mode 100644
index 5b6801c..0000000
--- a/html/wifi/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-
-body {
-	background-color: #404040;
-	font-family: sans-serif;
-}
-
-#main {
-	background-color: #d0d0FF;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	border-radius: 5px;
-	border: 2px solid #000000;
-	width: 800px;
-	margin: 0 auto;
-	padding: 20px
-}
diff --git a/html/wifi/wifi.tpl b/html/wifi/wifi.tpl
index 631b7bc..68f2b03 100644
--- a/html/wifi/wifi.tpl
+++ b/html/wifi/wifi.tpl
@@ -1,5 +1,5 @@
 <html><head><title>WiFi connection</title>
-<link rel="stylesheet" type="text/css" href="style.css">
+<link rel="stylesheet" type="text/css" href="../style.css">
 <script type="text/javascript" src="140medley.min.js"></script>
 <script type="text/javascript">
 
diff --git a/include/espmissingincludes.h b/include/espmissingincludes.h
index c8a0f24..a0d4318 100644
--- a/include/espmissingincludes.h
+++ b/include/espmissingincludes.h
@@ -7,6 +7,7 @@
 //MOST OF THESE ARE GUESSED! but they seem to swork and shut up the compiler.
 
 int atoi(const char *nptr);
+void ets_delay_us(long us);
 void ets_install_putc1(void *routine);
 void ets_isr_attach(int intr, void *handler, void *arg);
 void ets_isr_mask(unsigned intr);
diff --git a/user/cgi.c b/user/cgi.c
index 384bde4..6424d86 100644
--- a/user/cgi.c
+++ b/user/cgi.c
@@ -19,12 +19,13 @@ Some random cgi routines.
 #include "httpd.h"
 #include "cgi.h"
 #include "io.h"
+#include "dht22.h"
 #include "espmissingincludes.h"
 
 //cause I can't be bothered to write an ioGetLed()
 static char currLedState=0;
 
-//Cgi that turns the LED on or off according to the 'led' param in the POST data
+//Cgi that turns the LED on or off according to the 'led' param in the GET data
 int ICACHE_FLASH_ATTR cgiLed(HttpdConnData *connData) {
 	int len;
 	char buff[1024];
@@ -34,7 +35,7 @@ int ICACHE_FLASH_ATTR cgiLed(HttpdConnData *connData) {
 		return HTTPD_CGI_DONE;
 	}
 
-	len=httpdFindArg(connData->postBuff, "led", buff, sizeof(buff));
+	len=httpdFindArg(connData->getArgs, "led", buff, sizeof(buff));
 	if (len!=0) {
 		currLedState=atoi(buff);
 		ioLed(currLedState);
@@ -98,3 +99,22 @@ int ICACHE_FLASH_ATTR cgiReadFlash(HttpdConnData *connData) {
 	if (*pos>=0x40200000+(512*1024)) return HTTPD_CGI_DONE; else return HTTPD_CGI_MORE;
 }
 
+//Template code for the DHT 22 page.
+void ICACHE_FLASH_ATTR tplDHT(HttpdConnData *connData, char *token, void **arg) {
+	char buff[128];
+	if (token==NULL) return;
+
+	float * r = readDHT();
+	float lastTemp=r[0];
+	float lastHum=r[1];
+	
+	os_strcpy(buff, "Unknown");
+	if (os_strcmp(token, "temperature")==0) {
+			os_sprintf(buff, "%d.%d", (int)(lastTemp),(int)((lastTemp - (int)lastTemp)*100) );		
+	}
+	if (os_strcmp(token, "humidity")==0) {
+			os_sprintf(buff, "%d.%d", (int)(lastHum),(int)((lastHum - (int)lastHum)*100) );		
+	}	
+	
+	espconn_sent(connData->conn, (uint8 *)buff, os_strlen(buff));
+}
diff --git a/user/cgi.h b/user/cgi.h
index 6dbf923..79f23f7 100644
--- a/user/cgi.h
+++ b/user/cgi.h
@@ -5,6 +5,7 @@
 
 int cgiLed(HttpdConnData *connData);
 void tplLed(HttpdConnData *connData, char *token, void **arg);
+void tplDHT(HttpdConnData *connData, char *token, void **arg);
 int cgiReadFlash(HttpdConnData *connData);
 void tplCounter(HttpdConnData *connData, char *token, void **arg);
 
diff --git a/user/dht22.c b/user/dht22.c
new file mode 100644
index 0000000..0266cc7
--- /dev/null
+++ b/user/dht22.c
@@ -0,0 +1,122 @@
+
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * Jeroen Domburg <jeroen@spritesmods.com> wrote this file. As long as you retain 
+ * this notice you can do whatever you want with this stuff. If we meet some day, 
+ * and you think this stuff is worth it, you can buy me a beer in return. 
+ * ----------------------------------------------------------------------------
+ */
+
+#include "ets_sys.h"
+#include "osapi.h"
+#include "espmissingincludes.h"
+#include "c_types.h"
+#include "user_interface.h"
+#include "espconn.h"
+#include "mem.h"
+#include "gpio.h"
+
+#define MAXTIMINGS 10000
+#define BREAKTIME 20
+ 
+  float * ICACHE_FLASH_ATTR
+readDHT(void)
+{
+	static float r[2];
+    int counter = 0;
+    int laststate = 1;
+    int i = 0;
+    int j = 0;
+    int checksum = 0;
+    //int bitidx = 0;
+    //int bits[250];
+
+    int data[100];
+
+    data[0] = data[1] = data[2] = data[3] = data[4] = 0;
+
+    GPIO_OUTPUT_SET(2, 1);
+    os_delay_us(250000);
+    GPIO_OUTPUT_SET(2, 0);
+    os_delay_us(20000);
+    GPIO_OUTPUT_SET(2, 1);
+    os_delay_us(40);
+    GPIO_DIS_OUTPUT(2);
+    PIN_PULLUP_EN(PERIPHS_IO_MUX_GPIO2_U);
+
+
+    // wait for pin to drop?
+    while (GPIO_INPUT_GET(2) == 1 && i<100000) {
+          os_delay_us(1);
+          i++;
+    }
+
+        if(i==100000)
+          return r;
+
+    // read data!
+      
+    for (i = 0; i < MAXTIMINGS; i++) {
+        counter = 0;
+        while ( GPIO_INPUT_GET(2) == laststate) {
+            counter++;
+                        os_delay_us(1);
+            if (counter == 1000)
+                break;
+        }
+        laststate = GPIO_INPUT_GET(2);
+        if (counter == 1000) break;
+
+        //bits[bitidx++] = counter;
+
+        if ((i>3) && (i%2 == 0)) {
+            // shove each bit into the storage bytes
+            data[j/8] <<= 1;
+            if (counter > BREAKTIME)
+                data[j/8] |= 1;
+            j++;
+        }
+    }
+
+
+//    for (i=3; i<bitidx; i+=2) {
+//        os_printf("bit %d: %d\n", i-3, bits[i]);
+//        os_printf("bit %d: %d (%d)\n", i-2, bits[i+1], bits[i+1] > BREAKTIME);
+//    }
+//    os_printf("Data (%d): 0x%x 0x%x 0x%x 0x%x 0x%x\n", j, data[0], data[1], data[2], data[3], data[4]);
+
+    float temp_p, hum_p;
+    if (j >= 39) {
+        checksum = (data[0] + data[1] + data[2] + data[3]) & 0xFF;
+        if (data[4] == checksum) {
+            // yay! checksum is valid 
+            
+            hum_p = data[0] * 256 + data[1];
+            hum_p /= 10;
+
+            temp_p = (data[2] & 0x7F)* 256 + data[3];
+            temp_p /= 10.0;
+            if (data[2] & 0x80)
+                temp_p *= -1;
+			os_printf("Temp =  %d *C, Hum = %d %%\n", (int)(temp_p*100), (int)(hum_p*100));
+			r[0] = temp_p;
+			r[1] = hum_p;
+            
+        }
+    }
+	return r;
+}
+
+
+
+void ICACHE_FLASH_ATTR DHT(void) {
+	 readDHT();
+}
+
+
+void DHTInit() {
+    //Set GPIO2 to output mode for DHT22
+    PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO2_U, FUNC_GPIO2);
+    PIN_PULLUP_EN(PERIPHS_IO_MUX_GPIO2_U);
+}
diff --git a/user/dht22.h b/user/dht22.h
new file mode 100644
index 0000000..1d7c487
--- /dev/null
+++ b/user/dht22.h
@@ -0,0 +1,4 @@
+
+void ICACHE_FLASH_ATTR DHT(void);
+float * ICACHE_FLASH_ATTR readDHT(void);
+void DHTInit(void);
diff --git a/user/io.c b/user/io.c
index f53d408..df432ed 100644
--- a/user/io.c
+++ b/user/io.c
@@ -8,21 +8,21 @@
  * ----------------------------------------------------------------------------
  */
 
-
+#include "ets_sys.h"
+#include "osapi.h"
 #include "espmissingincludes.h"
 #include "c_types.h"
 #include "user_interface.h"
 #include "espconn.h"
 #include "mem.h"
-#include "osapi.h"
 #include "gpio.h"
 
-
-#define LEDGPIO 2
+#define LEDGPIO 13
 #define BTNGPIO 0
 
 static ETSTimer resetBtntimer;
 
+
 void ICACHE_FLASH_ATTR ioLed(int ena) {
 	//gpio_output_set is overkill. ToDo: use better mactos
 	if (ena) {
@@ -48,9 +48,12 @@ static void ICACHE_FLASH_ATTR resetBtnTimerCb(void *arg) {
 }
 
 void ioInit() {
-	PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO2_U, FUNC_GPIO2);
+	
+	//Set GPIO13 to output mode for LED
+	PIN_FUNC_SELECT(PERIPHS_IO_MUX_MTCK_U, FUNC_GPIO13);
 	PIN_FUNC_SELECT(PERIPHS_IO_MUX_GPIO0_U, FUNC_GPIO0);
 	gpio_output_set(0, 0, (1<<LEDGPIO), (1<<BTNGPIO));
+	
 	os_timer_disarm(&resetBtntimer);
 	os_timer_setfn(&resetBtntimer, resetBtnTimerCb, NULL);
 	os_timer_arm(&resetBtntimer, 500, 1);
diff --git a/user/user_main.c b/user/user_main.c
index abb9476..7958fef 100644
--- a/user/user_main.c
+++ b/user/user_main.c
@@ -9,12 +9,13 @@
  * ----------------------------------------------------------------------------
  */
 
-
 #include "espmissingincludes.h"
-#include "ets_sys.h"
 #include "osapi.h"
+
+#include "ets_sys.h"
 #include "httpd.h"
 #include "io.h"
+#include "dht22.h"
 #include "httpdespfs.h"
 #include "cgi.h"
 #include "cgiwifi.h"
@@ -24,6 +25,7 @@ HttpdBuiltInUrl builtInUrls[]={
 	{"/", cgiRedirect, "/index.tpl"},
 	{"/flash.bin", cgiReadFlash, NULL},
 	{"/led.tpl", cgiEspFsTemplate, tplLed},
+	{"/dht22.tpl", cgiEspFsTemplate, tplDHT},
 	{"/index.tpl", cgiEspFsTemplate, tplCounter},
 	{"/led.cgi", cgiLed, NULL},
 
@@ -42,6 +44,7 @@ HttpdBuiltInUrl builtInUrls[]={
 void user_init(void) {
 	stdoutInit();
 	ioInit();
+	DHTInit();
 	httpdInit(builtInUrls, 80);
 	os_printf("\nReady\n");
 }