diff --git a/.gitignore b/.gitignore
index d88f1f2da..6245c1dd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.lss
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
 hardware/arduino/bootloaders/caterina_LUFA/.dep/
-build/libastylej-*.zip
+build/*.zip
 build/windows/work/
 build/windows/*.zip
 build/windows/*.tgz
diff --git a/cores/esp8266/Esp.cpp b/cores/esp8266/Esp.cpp
index 32b4aecd3..cdf38dde3 100644
--- a/cores/esp8266/Esp.cpp
+++ b/cores/esp8266/Esp.cpp
@@ -291,7 +291,7 @@ uint32_t EspClass::getFlashChipSizeByChipId(void) {
 String EspClass::getResetInfo(void) {
     if(resetInfo.reason != 0) {
         char buff[200];
-        sprintf(&buff[0], "Fatal exception:%d flag:%d (%s) epc1:0x%08x epc2:0x%08x epc3:0x%08x excvaddr:0x%08x depc:0x%08x", resetInfo.exccause, resetInfo.reason,     (resetInfo.reason == 0 ? "DEFAULT" : resetInfo.reason == 1 ? "WDT" : resetInfo.reason == 2 ? "EXCEPTION" : resetInfo.reason == 3 ? "SOFT_WDT" : resetInfo.reason == 4 ? "SOFT_RESTART" : resetInfo.reason == 5 ? "DEEP_SLEEP_AWAKE" : "???"), resetInfo.epc1, resetInfo.epc2, resetInfo.epc3, resetInfo.excvaddr, resetInfo.depc);
+        sprintf(&buff[0], "Fatal exception:%d flag:%d (%s) epc1:0x%08x epc2:0x%08x epc3:0x%08x excvaddr:0x%08x depc:0x%08x", resetInfo.exccause, resetInfo.reason, (resetInfo.reason == 0 ? "DEFAULT" : resetInfo.reason == 1 ? "WDT" : resetInfo.reason == 2 ? "EXCEPTION" : resetInfo.reason == 3 ? "SOFT_WDT" : resetInfo.reason == 4 ? "SOFT_RESTART" : resetInfo.reason == 5 ? "DEEP_SLEEP_AWAKE" : "???"), resetInfo.epc1, resetInfo.epc2, resetInfo.epc3, resetInfo.excvaddr, resetInfo.depc);
         return String(buff);
     }
     return String("flag: 0");
diff --git a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
index 63c180c31..3f2692a50 100644
--- a/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
+++ b/libraries/ESP8266WiFi/src/ESP8266WiFiMulti.h
@@ -32,7 +32,7 @@
 #undef max
 #include <vector>
 
-//#define DEBUG_WIFI_MULTI(...) Serial1.printf( __VA_ARGS__ )
+#define DEBUG_WIFI_MULTI(...) Serial1.printf( __VA_ARGS__ )
 
 #ifndef DEBUG_WIFI_MULTI
 #define DEBUG_WIFI_MULTI(...)
diff --git a/libraries/SD/README.adoc b/libraries/SD/README.adoc
index 4c6521ed3..fabff563c 100644
--- a/libraries/SD/README.adoc
+++ b/libraries/SD/README.adoc
@@ -3,7 +3,7 @@
 The SD library allows for reading from and writing to SD cards.
 
 For more information about this library please visit us at
-http://arduino.cc/en/Reference/SD
+http://www.arduino.cc/en/Reference/SD
 
 == License ==
 
diff --git a/libraries/SD/library.properties b/libraries/SD/library.properties
index 4658054f8..bc8c4e498 100644
--- a/libraries/SD/library.properties
+++ b/libraries/SD/library.properties
@@ -1,9 +1,9 @@
 name=SD
-version=1.0.4
+version=1.0.5
 author=Arduino, SparkFun
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables reading and writing on SD cards. For all Arduino boards.
 paragraph=Once an SD memory card is connected to the SPI interfare of the Arduino board you are enabled to create files and read/write on them. You can also move through directories on the SD card.
 category=Data Storage
-url=http://arduino.cc/en/Reference/SD
+url=http://www.arduino.cc/en/Reference/SD
 architectures=*
diff --git a/libraries/SD/src/SD.h b/libraries/SD/src/SD.h
index 62276b4ee..653adabee 100644
--- a/libraries/SD/src/SD.h
+++ b/libraries/SD/src/SD.h
@@ -93,18 +93,23 @@ public:
   // write, etc). Returns a File object for interacting with the file.
   // Note that currently only one file can be open at a time.
   File open(const char *filename, uint8_t mode = FILE_READ);
+  File open(const String &filename, uint8_t mode = FILE_READ) { return open( filename.c_str(), mode ); }
 
   // Methods to determine if the requested file path exists.
   boolean exists(char *filepath);
+  boolean exists(const String &filepath) { return exists(filepath.c_str()); }
 
   // Create the requested directory heirarchy--if intermediate directories
   // do not exist they will be created.
   boolean mkdir(char *filepath);
+  boolean mkdir(const String &filepath) { return mkdir(filepath.c_str()); }
   
   // Delete the file.
   boolean remove(char *filepath);
+  boolean remove(const String &filepath) { return remove(filepath.c_str()); }
   
   boolean rmdir(char *filepath);
+  boolean rmdir(const String &filepath) { return rmdir(filepath.c_str()); }
 
   uint8_t type(){ return card.type(); }
   uint8_t fatType(){ return volume.fatType(); }