diff --git a/hardware/arduino/esp8266/libraries/ESP8266WiFi/keywords.txt b/hardware/arduino/esp8266/libraries/ESP8266WiFi/keywords.txt
index 7a6f0bc05..8f26dffaa 100644
--- a/hardware/arduino/esp8266/libraries/ESP8266WiFi/keywords.txt
+++ b/hardware/arduino/esp8266/libraries/ESP8266WiFi/keywords.txt
@@ -51,7 +51,10 @@ endPacket	KEYWORD2
 parsePacket	KEYWORD2
 remoteIP	KEYWORD2
 remotePort	KEYWORD2
-
+softAP	KEYWORD2
+softAPIP	KEYWORD2
+softAPmacAddress	KEYWORD2
+printDiag	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)
diff --git a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
index 26a7344f3..7c48bab9e 100644
--- a/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
+++ b/hardware/arduino/esp8266/libraries/ESP8266WiFi/src/ESP8266WiFi.cpp
@@ -157,14 +157,13 @@ IPAddress ESP8266WiFiClass::localIP()
     return IPAddress(ip.ip.addr);
 }
 
-IPAddress softAPIP()
+IPAddress ESP8266WiFiClass::softAPIP()
 {
     struct ip_info ip;
     wifi_get_ip_info(SOFTAP_IF, &ip);
     return IPAddress(ip.ip.addr);    
 }
 
-
 IPAddress ESP8266WiFiClass::subnetMask()
 {
     struct ip_info ip;