diff --git a/boards.txt b/boards.txt
index 165ccae51d..70ff0b8b0e 100644
--- a/boards.txt
+++ b/boards.txt
@@ -405,6 +405,46 @@ espresso_lite_v1.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
 espresso_lite_v1.menu.ResetMethod.ck=ck
 espresso_lite_v1.menu.ResetMethod.ck.upload.resetmethod=ck
 
+espresso_lite_v1.menu.Debug.Disabled=Disabled
+espresso_lite_v1.menu.Debug.Disabled.build.debug_port=
+espresso_lite_v1.menu.Debug.Serial=Serial
+espresso_lite_v1.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+espresso_lite_v1.menu.Debug.Serial1=Serial1
+espresso_lite_v1.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+
+espresso_lite_v1.menu.DebugLevel.None____=None
+espresso_lite_v1.menu.DebugLevel.None____.build.debug_level=
+espresso_lite_v1.menu.DebugLevel.Core____=Core
+espresso_lite_v1.menu.DebugLevel.Core____.build.debug_level=-DDEBUG_ESP_CORE
+espresso_lite_v1.menu.DebugLevel.SSL_____=Core + SSL
+espresso_lite_v1.menu.DebugLevel.SSL_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
+espresso_lite_v1.menu.DebugLevel.SSL_MEM_=Core + SSL + TLS Mem
+espresso_lite_v1.menu.DebugLevel.SSL_MEM_.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_TLS_MEM
+espresso_lite_v1.menu.DebugLevel.WiFic___=Core + WiFi
+espresso_lite_v1.menu.DebugLevel.WiFic___.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
+espresso_lite_v1.menu.DebugLevel.WiFi____=WiFi
+espresso_lite_v1.menu.DebugLevel.WiFi____.build.debug_level=-DDEBUG_ESP_WIFI
+espresso_lite_v1.menu.DebugLevel.HTTPClient=HTTPClient
+espresso_lite_v1.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
+espresso_lite_v1.menu.DebugLevel.HTTPClient2=HTTPClient + SSL
+espresso_lite_v1.menu.DebugLevel.HTTPClient2.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_SSL
+espresso_lite_v1.menu.DebugLevel.HTTPUpdate=HTTPUpdate
+espresso_lite_v1.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
+espresso_lite_v1.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
+espresso_lite_v1.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
+espresso_lite_v1.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
+espresso_lite_v1.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
+espresso_lite_v1.menu.DebugLevel.HTTPServer=HTTPServer
+espresso_lite_v1.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v1.menu.DebugLevel.UPDATER=Updater
+espresso_lite_v1.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
+espresso_lite_v1.menu.DebugLevel.OTA_____=OTA
+espresso_lite_v1.menu.DebugLevel.OTA_____.build.debug_level=-DDEBUG_ESP_OTA
+espresso_lite_v1.menu.DebugLevel.OTA2____=OTA + Updater
+espresso_lite_v1.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
+espresso_lite_v1.menu.DebugLevel.all_____=All
+espresso_lite_v1.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
+
 espresso_lite_v1.build.debug_port=
 espresso_lite_v1.build.debug_level=
 
@@ -418,7 +458,7 @@ espresso_lite_v2.upload.wait_for_upload_port=true
 
 espresso_lite_v2.build.mcu=esp8266
 espresso_lite_v2.build.f_cpu=80000000L
-espresso_lite_v2.build.board=ESP8266_espresso_lite_v2
+espresso_lite_v2.build.board=ESP8266_ESPRESSO_LITE_V2
 espresso_lite_v2.build.core=esp8266
 espresso_lite_v2.build.variant=espresso_lite_v2
 espresso_lite_v2.build.flash_mode=dio
@@ -470,6 +510,46 @@ espresso_lite_v2.menu.ResetMethod.ck.upload.resetmethod=ck
 espresso_lite_v2.menu.ResetMethod.nodemcu=nodemcu
 espresso_lite_v2.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
 
+espresso_lite_v2.menu.Debug.Disabled=Disabled
+espresso_lite_v2.menu.Debug.Disabled.build.debug_port=
+espresso_lite_v2.menu.Debug.Serial=Serial
+espresso_lite_v2.menu.Debug.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+espresso_lite_v2.menu.Debug.Serial1=Serial1
+espresso_lite_v2.menu.Debug.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+
+espresso_lite_v2.menu.DebugLevel.None____=None
+espresso_lite_v2.menu.DebugLevel.None____.build.debug_level=
+espresso_lite_v2.menu.DebugLevel.Core____=Core
+espresso_lite_v2.menu.DebugLevel.Core____.build.debug_level=-DDEBUG_ESP_CORE
+espresso_lite_v2.menu.DebugLevel.SSL_____=Core + SSL
+espresso_lite_v2.menu.DebugLevel.SSL_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL
+espresso_lite_v2.menu.DebugLevel.SSL_MEM_=Core + SSL + TLS Mem
+espresso_lite_v2.menu.DebugLevel.SSL_MEM_.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_TLS_MEM
+espresso_lite_v2.menu.DebugLevel.WiFic___=Core + WiFi
+espresso_lite_v2.menu.DebugLevel.WiFic___.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI
+espresso_lite_v2.menu.DebugLevel.WiFi____=WiFi
+espresso_lite_v2.menu.DebugLevel.WiFi____.build.debug_level=-DDEBUG_ESP_WIFI
+espresso_lite_v2.menu.DebugLevel.HTTPClient=HTTPClient
+espresso_lite_v2.menu.DebugLevel.HTTPClient.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT
+espresso_lite_v2.menu.DebugLevel.HTTPClient2=HTTPClient + SSL
+espresso_lite_v2.menu.DebugLevel.HTTPClient2.build.debug_level=-DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_SSL
+espresso_lite_v2.menu.DebugLevel.HTTPUpdate=HTTPUpdate
+espresso_lite_v2.menu.DebugLevel.HTTPUpdate.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE
+espresso_lite_v2.menu.DebugLevel.HTTPUpdate2=HTTPClient + HTTPUpdate
+espresso_lite_v2.menu.DebugLevel.HTTPUpdate2.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE
+espresso_lite_v2.menu.DebugLevel.HTTPUpdate3=HTTPClient + HTTPUpdate + Updater
+espresso_lite_v2.menu.DebugLevel.HTTPUpdate3.build.debug_level=-DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER
+espresso_lite_v2.menu.DebugLevel.HTTPServer=HTTPServer
+espresso_lite_v2.menu.DebugLevel.HTTPServer.build.debug_level=-DDEBUG_ESP_HTTP_SERVER
+espresso_lite_v2.menu.DebugLevel.UPDATER=Updater
+espresso_lite_v2.menu.DebugLevel.UPDATER.build.debug_level=-DDEBUG_ESP_UPDATER
+espresso_lite_v2.menu.DebugLevel.OTA_____=OTA
+espresso_lite_v2.menu.DebugLevel.OTA_____.build.debug_level=-DDEBUG_ESP_OTA
+espresso_lite_v2.menu.DebugLevel.OTA2____=OTA + Updater
+espresso_lite_v2.menu.DebugLevel.OTA2____.build.debug_level=-DDEBUG_ESP_OTA -DDEBUG_ESP_UPDATER
+espresso_lite_v2.menu.DebugLevel.all_____=All
+espresso_lite_v2.menu.DebugLevel.all_____.build.debug_level=-DDEBUG_ESP_CORE -DDEBUG_ESP_SSL -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_TLS_MEM
+
 espresso_lite_v2.build.debug_port=
 espresso_lite_v2.build.debug_level=
 
diff --git a/bootloaders/eboot/Makefile b/bootloaders/eboot/Makefile
index 7a07d76151..e078263caa 100644
--- a/bootloaders/eboot/Makefile
+++ b/bootloaders/eboot/Makefile
@@ -1,5 +1,5 @@
 XTENSA_TOOLCHAIN ?= ../../tools/xtensa-lx106-elf/bin/
-ESPTOOL ?= ../../tools/esptool
+ESPTOOL ?= ../../tools/esptool/esptool
 
 BIN_DIR := ./
 TARGET_DIR := ./
@@ -7,7 +7,7 @@ TARGET_DIR := ./
 TARGET_OBJ_FILES := \
 	eboot.o \
 	eboot_command.o \
-	
+
 
 TARGET_OBJ_PATHS := $(addprefix $(TARGET_DIR)/,$(TARGET_OBJ_FILES))
 
@@ -50,4 +50,3 @@ clean:
 
 
 .PHONY: all clean default
-
diff --git a/bootloaders/eboot/eboot.c b/bootloaders/eboot/eboot.c
index 3c0bc1cce5..f53d3c9125 100644
--- a/bootloaders/eboot/eboot.c
+++ b/bootloaders/eboot/eboot.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015 Ivan Grokhotkov. All rights reserved.
+/* Copyright (c) 2015-2016 Ivan Grokhotkov. All rights reserved.
  * This file is part of eboot bootloader.
  *
  * Redistribution and use is permitted according to the conditions of the
@@ -115,14 +115,16 @@ void main()
     int res = 9;
     struct eboot_command cmd;
 
-    if (eboot_command_read(&cmd)) {
+    if (eboot_command_read(&cmd) == 0) {
+        // valid command was passed via RTC_MEM
+        eboot_command_clear();
+        ets_putc('@');
+    } else {
+        // no valid command found
         cmd.action = ACTION_LOAD_APP;
         cmd.args[0] = 0;
         ets_putc('~');
-    } else {
-        ets_putc('@');
     }
-    eboot_command_clear();
 
     if (cmd.action == ACTION_COPY_RAW) {
         ets_putc('c'); ets_putc('p'); ets_putc(':');
diff --git a/bootloaders/eboot/eboot.elf b/bootloaders/eboot/eboot.elf
index 7fb4f5f93a..aa61b97f02 100755
Binary files a/bootloaders/eboot/eboot.elf and b/bootloaders/eboot/eboot.elf differ
diff --git a/cores/esp8266/IPAddress.cpp b/cores/esp8266/IPAddress.cpp
index f416c7c64c..93a081eb25 100644
--- a/cores/esp8266/IPAddress.cpp
+++ b/cores/esp8266/IPAddress.cpp
@@ -112,3 +112,4 @@ String IPAddress::toString()
     return String(szRet);
 }
 
+const IPAddress INADDR_NONE(0, 0, 0, 0);
diff --git a/cores/esp8266/IPAddress.h b/cores/esp8266/IPAddress.h
index 9248084b23..9e7dfe5e29 100644
--- a/cores/esp8266/IPAddress.h
+++ b/cores/esp8266/IPAddress.h
@@ -87,6 +87,6 @@ class IPAddress: public Printable {
         friend class DNSClient;
 };
 
-const IPAddress INADDR_NONE(0, 0, 0, 0);
+extern const IPAddress INADDR_NONE;
 
 #endif
diff --git a/tests/common.sh b/tests/common.sh
index a3cc30f363..61757dbe77 100755
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -40,12 +40,12 @@ function build_sketches()
     local build_arg=$3
     local build_dir=build.tmp
     mkdir -p $build_dir
-    rm -rf $build_dir/*
     local build_cmd="python tools/build.py -b generic -v -k -p $PWD/$build_dir $build_arg "
     local sketches=$(find $srcpath -name *.ino)
     print_size_info >size.log
     export ARDUINO_IDE_PATH=$arduino
     for sketch in $sketches; do
+        rm -rf $build_dir/*
         local sketchdir=$(dirname $sketch)
         local sketchdirname=$(basename $sketchdir)
         local sketchname=$(basename $sketch)