diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c08e1526..645e64db 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,7 +15,7 @@ If you don't find anything, please [open a new issue](https://github.com/khoih-p
 Please ensure to specify the following:
 
 * Arduino IDE version (e.g. 1.8.15) or Platform.io version
-* Core Version (e.g. Arduino SAMD core v1.8.11, Adafruit SAMD core v1.7.3, Arduino-mbed RP2040 v2.2.0)
+* Core Version (e.g. Arduino SAMD core v1.8.11, Adafruit SAMD core v1.7.3, Arduino-mbed RP2040 v2.3.1)
 * Board type (e.g. NANO_RP2040_CONNECT, RASPBERRY_PI_PICO, ADAFRUIT_FEATHER_RP2040, GENERIC_RP2040, etc.)
 * Contextual information (e.g. what you were trying to achieve)
 * Simplest possible steps to reproduce
@@ -28,10 +28,10 @@ Please ensure to specify the following:
 
 ```
 Arduino IDE version: 1.8.15
-Arduino-mbed RP2040 v2.2.0
+Arduino-mbed RP2040 v2.3.1
 NANO_RP2040_CONNECT Module
 OS: Ubuntu 20.04 LTS
-Linux xy-Inspiron-3593 5.4.0-77-generic #86-Ubuntu SMP Thu Jun 17 02:35:03 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
+Linux xy-Inspiron-3593 5.4.0-80-generic #90-Ubuntu SMP Fri Jul 9 22:49:44 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
 
 Context:
 I encountered an endless loop while trying to connect to Local WiFi.
diff --git a/README.md b/README.md
index 852e558c..e1b4891a 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@
   * [Features](#features)
   * [Currently supported Boards](#currently-supported-boards)
 * [Changelog](#changelog)
+  * [Releases v1.8.13](#releases-v1813)
   * [Releases v1.8.12](#releases-v1812)
   * [Releases v1.8.11](#releases-v1811)
   * [Releases v1.8.10-1](#releases-v1810-1)
@@ -145,6 +146,13 @@ This [**WiFiNINA_Generic library**](https://github.com/khoih-prog/WiFiNINA_Gener
 
 ## Changelog
 
+### Releases v1.8.13
+
+1. Sync with [Arduino WiFiNINA Library v1.8.13](https://github.com/arduino-libraries/WiFiNINA/releases/tag/1.8.13). 
+  - Update latest available nina-fw to v1.4.8
+
+2. Add support to SAMD51 ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
+
 ### Releases v1.8.12
 
 1. Sync with [Arduino WiFiNINA Library v1.8.12](https://github.com/arduino-libraries/WiFiNINA/releases/tag/1.8.12). 
@@ -250,15 +258,15 @@ Again with credits of [Miguel Alexandre Wisintainer](https://github.com/tcpipchi
 
  1. [`Arduino IDE 1.8.15+`](https://www.arduino.cc/en/Main/Software)
  2. [`Arduino AVR core 1.8.3+`](https://github.com/arduino/ArduinoCore-avr) for Arduino (Use Arduino Board Manager) for AVR boards. [![GitHub release](https://img.shields.io/github/release/arduino/ArduinoCore-avr.svg)](https://github.com/arduino/ArduinoCore-avr/releases/latest)
- 3. [`Teensy core 1.51`](https://www.pjrc.com/teensy/td_download.html) for Teensy (4.1, 4.0, 3.6, 3.5, 3,2, 3.1, 3.0, LC) boards
+ 3. [`Teensy core 1.54`](https://www.pjrc.com/teensy/td_download.html) for Teensy (4.1, 4.0, 3.6, 3.5, 3,2, 3.1, 3.0, LC) boards
  4. [`Arduino SAM DUE core 1.6.12+`](https://github.com/arduino/ArduinoCore-sam) for SAM DUE ARM Cortex-M3 boards
  5. [`Arduino SAMD core 1.8.11+`](https://www.arduino.cc/en/Guide/ArduinoM0) for SAMD ARM Cortex-M0+ boards. [![GitHub release](https://img.shields.io/github/release/arduino/ArduinoCore-samd.svg)](https://github.com/arduino/ArduinoCore-samd/releases/latest)
  6. [`Adafruit SAMD core 1.7.3+`](https://www.adafruit.com/) for SAMD ARM Cortex-M0+ and M4 boards (Nano 33 IoT, etc.). [![GitHub release](https://img.shields.io/github/release/adafruit/ArduinoCore-samd.svg)](https://github.com/adafruit/ArduinoCore-samd/releases/latest)
  7. [`Seeeduino SAMD core 1.8.1+`](https://github.com/Seeed-Studio/ArduinoCore-samd) for SAMD21/SAMD51 boards (XIAO M0, Wio Terminal, etc.). [![Latest release](https://img.shields.io/github/release/Seeed-Studio/ArduinoCore-samd.svg)](https://github.com/Seeed-Studio/ArduinoCore-samd/releases/latest/)
  8. [`Adafruit nRF52 v0.24.0+`](https://www.adafruit.com) for nRF52 boards such as Adafruit NRF52840_FEATHER, NRF52832_FEATHER, NRF52840_FEATHER_SENSE, NRF52840_ITSYBITSY, NRF52840_CIRCUITPLAY, NRF52840_CLUE, NRF52840_METRO, NRF52840_PCA10056, PARTICLE_XENON, **NINA_B302_ublox**, etc. [![GitHub release](https://img.shields.io/github/release/adafruit/Adafruit_nRF52_Arduino.svg)](https://github.com/adafruit/Adafruit_nRF52_Arduino/releases/latest)
  9. [`Arduino Core for STM32 v2.0.0+`](https://github.com/stm32duino/Arduino_Core_STM32) for STM32F/L/H/G/WB/MP1 boards. [![GitHub release](https://img.shields.io/github/release/stm32duino/Arduino_Core_STM32.svg)](https://github.com/stm32duino/Arduino_Core_STM32/releases/latest)
-10. [`Arduino mbed_rp2040 core 2.2.0+`](https://github.com/arduino/ArduinoCore-mbed) for Arduino (Use Arduino Board Manager) RP2040-based boards, such as **Arduino Nano RP2040 Connect, RASPBERRY_PI_PICO, etc.**. [![GitHub release](https://img.shields.io/github/release/arduino/ArduinoCore-mbed.svg)](https://github.com/arduino/ArduinoCore-mbed/releases/latest)
-11. [`Earle Philhower's arduino-pico core v1.9.1+`](https://github.com/earlephilhower/arduino-pico) for RP2040-based boards such as **RASPBERRY_PI_PICO, ADAFRUIT_FEATHER_RP2040 and GENERIC_RP2040**, etc. [![GitHub release](https://img.shields.io/github/release/earlephilhower/arduino-pico.svg)](https://github.com/earlephilhower/arduino-pico/releases/latest)
+10. [`Arduino mbed_rp2040 core 2.3.1+`](https://github.com/arduino/ArduinoCore-mbed) for Arduino (Use Arduino Board Manager) RP2040-based boards, such as **Arduino Nano RP2040 Connect, RASPBERRY_PI_PICO, etc.**. [![GitHub release](https://img.shields.io/github/release/arduino/ArduinoCore-mbed.svg)](https://github.com/arduino/ArduinoCore-mbed/releases/latest)
+11. [`Earle Philhower's arduino-pico core v1.9.2+`](https://github.com/earlephilhower/arduino-pico) for RP2040-based boards such as **RASPBERRY_PI_PICO, ADAFRUIT_FEATHER_RP2040 and GENERIC_RP2040**, etc. [![GitHub release](https://img.shields.io/github/release/earlephilhower/arduino-pico.svg)](https://github.com/earlephilhower/arduino-pico/releases/latest)
 12. [`Arduino AVR core 1.8.3+`](https://github.com/arduino/ArduinoCore-avr) for Arduino AVR boards. Use Arduino Board Manager to install. [![Latest release](https://img.shields.io/github/release/arduino/ArduinoCore-avr.svg)](https://github.com/arduino/ArduinoCore-avr/releases/latest/)
 13. [`Adafruit AVR core 1.4.13+`](https://github.com/adafruit/Adafruit_Arduino_Boards) for Adafruit AVR boards. Use Arduino Board Manager to install. 
 14. [`Sparkfun AVR core 1.1.13+`](https://github.com/sparkfun/Arduino_Boards) for Sparkfun AVR boards. Use Arduino Board Manager to install. 
@@ -596,7 +604,7 @@ For example
 
 ```
 Start WiFiNINA CheckFirmwareVersion on SAMD_NANO_33_IOT
-WiFiNINA_Generic v1.8.12
+WiFiNINA_Generic v1.8.13
 Firmware version installed: aaa.bbb.ccc
 Latest firmware version available : aaa.bbb.ccc
 
@@ -1177,7 +1185,7 @@ The following are screen shot and debug terminal output when running example [Ad
 
 ```
 Starting AdvancedServer on SAMD_NANO_33_IOT
-WiFiNINA_Generic v1.8.12
+WiFiNINA_Generic v1.8.13
 [NN] ===============================
 [NN] 
 Used/default SPI pinout: 
@@ -1349,6 +1357,13 @@ Sometimes, the library will only work if you update the `WiFiNINA module/shield`
 
 ## Releases
 
+### Releases v1.8.13
+
+1. Sync with [Arduino WiFiNINA Library v1.8.13](https://github.com/arduino-libraries/WiFiNINA/releases/tag/1.8.13). 
+  - Update latest available nina-fw to v1.4.8
+
+2. Add support to SAMD51 ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
+
 ### Releases v1.8.12
 
 1. Sync with [Arduino WiFiNINA Library v1.8.12](https://github.com/arduino-libraries/WiFiNINA/releases/tag/1.8.12). 
@@ -1476,6 +1491,7 @@ Again with credits of [Miguel Alexandre Wisintainer](https://github.com/tcpipchi
 16. Add support to **Generic or Sparkfun AVR ATmega_32U4** such as **AVR_MAKEYMAKEY, AVR_PROMICRO, etc.**
 17. Add support to **Generic or Sparkfun AVR ATmega_328(P)** such as **ARDUINO_REDBOT, ARDUINO_AVR_DIGITAL_SANDBOX, etc.**
 18. Add support to **Generic or Sparkfun AVR ATmega128RFA1** such as **ATMEGA128RFA1_DEV_BOARD, etc.**
+19. Add support to **ADAFRUIT_MATRIXPORTAL_M4_EXPRESS**
 
 ---
 
diff --git a/examples/SimpleWebServerWiFi/SimpleWebServerWiFi.ino b/examples/SimpleWebServerWiFi/SimpleWebServerWiFi.ino
index a287fb87..eaf9c65a 100644
--- a/examples/SimpleWebServerWiFi/SimpleWebServerWiFi.ino
+++ b/examples/SimpleWebServerWiFi/SimpleWebServerWiFi.ino
@@ -164,12 +164,12 @@ void loop()
         // Check to see if the client request was "GET /H" or "GET /L":
         if (currentLine.endsWith("GET /H")) 
         {
-          digitalWrite(9, HIGH);               // GET /H turns the LED on
+          digitalWrite(LED_BUILTIN, HIGH);               // GET /H turns the LED on
         }
         
         if (currentLine.endsWith("GET /L")) 
         {
-          digitalWrite(9, LOW);                // GET /L turns the LED off
+          digitalWrite(LED_BUILTIN, LOW);                // GET /L turns the LED off
         }
       }
     }
diff --git a/library.json b/library.json
index 24b4b1c8..f05a77cd 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "WiFiNINA_Generic",
-  "version": "1.8.12",
+  "version": "1.8.13",
   "keywords": "wifi, wi-fi, WiFiNINA, NINA-B302-ublox, W101, W102, shield, Teensy, SAM DUE, SAMD, STM32, nRF52, rpi-pico, rp2040, Credentials, Manager, nano-rp2040-connect, raspberry-pi-pico, mega, 32u4",
   "description": "Enables network connection (local and Internet) and WiFiStorage for SAM DUE, SAMD21, SAMD51, Teensy, AVR (328P, 32u4, 16u4, etc.), Mega, STM32F/L/H/G/WB/MP1, nRF52, NINA_B302_ublox, NINA_B112_ublox, RP2040-based boards, etc. in addition to Arduino MKR WiFi 1010, Arduino MKR VIDOR 4000, Arduino UNO WiFi Rev.2, Nano 33 IoT, Nano RP2040 Connect",
   "authors": [
diff --git a/library.properties b/library.properties
index 4da001a1..1045a661 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=WiFiNINA_Generic
-version=1.8.12
+version=1.8.13
 author=Arduino, Khoi Hoang <khoih.prog@gmail.com>
 maintainer=Khoi Hoang <khoih.prog@gmail.com>
 sentence=Enables network connection (local and Internet) and WiFiStorage for SAM DUE, SAMD21, SAMD51, Teensy, AVR (328P, 32u4, 16u4, etc.), Mega, STM32F/L/H/G/WB/MP1, nRF52, NINA_B302_ublox, NINA_B112_ublox, RP2040-based boards, etc. in addition to Arduino MKR WiFi 1010, Arduino MKR VIDOR 4000, Arduino UNO WiFi Rev.2, Nano 33 IoT, Nano RP2040 Connect
diff --git a/src/WiFiClient_Generic.cpp b/src/WiFiClient_Generic.cpp
index db5fc91e..c196c2be 100644
--- a/src/WiFiClient_Generic.cpp
+++ b/src/WiFiClient_Generic.cpp
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #define _WIFININA_LOGLEVEL_         1
diff --git a/src/WiFiClient_Generic.h b/src/WiFiClient_Generic.h
index b1e58c93..59f555cc 100644
--- a/src/WiFiClient_Generic.h
+++ b/src/WiFiClient_Generic.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/WiFiNINA_Generic.h b/src/WiFiNINA_Generic.h
index 02d3d3ed..97823a0f 100644
--- a/src/WiFiNINA_Generic.h
+++ b/src/WiFiNINA_Generic.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/WiFiNINA_Pinout_Generic.h b/src/WiFiNINA_Pinout_Generic.h
index 5d32289a..49da16ce 100644
--- a/src/WiFiNINA_Pinout_Generic.h
+++ b/src/WiFiNINA_Pinout_Generic.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
@@ -239,7 +240,7 @@
     
       #warning ADAFRUIT_METRO_M4_AIRLIFT_LITE or ADAFRUIT_PYBADGE_AIRLIFT_M4 are OK to use
       
-   #elif ( defined(ADAFRUIT_MATRIXPORTAL_M4_EXPRESS)  )  
+    #elif ( defined(ADAFRUIT_MATRIXPORTAL_M4_EXPRESS)  )  
       
       #warning You have to modify pin usage according to actual connection for SAMD51 ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
       // To define pin out for WiFiNINA here
diff --git a/src/WiFiSSLClient_Generic.cpp b/src/WiFiSSLClient_Generic.cpp
index b4887096..8b52e5a4 100644
--- a/src/WiFiSSLClient_Generic.cpp
+++ b/src/WiFiSSLClient_Generic.cpp
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #include "WiFiSSLClient_Generic.h"
diff --git a/src/WiFiSSLClient_Generic.h b/src/WiFiSSLClient_Generic.h
index ef1b312a..732cecfd 100644
--- a/src/WiFiSSLClient_Generic.h
+++ b/src/WiFiSSLClient_Generic.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/WiFiServer_Generic.cpp b/src/WiFiServer_Generic.cpp
index 1a2c7caa..aab44c24 100644
--- a/src/WiFiServer_Generic.cpp
+++ b/src/WiFiServer_Generic.cpp
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #include <string.h>
diff --git a/src/WiFiServer_Generic.h b/src/WiFiServer_Generic.h
index 392c8c62..fb23b70a 100644
--- a/src/WiFiServer_Generic.h
+++ b/src/WiFiServer_Generic.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/WiFiStorage_Generic.cpp b/src/WiFiStorage_Generic.cpp
index 6baa141f..a67ec64d 100644
--- a/src/WiFiStorage_Generic.cpp
+++ b/src/WiFiStorage_Generic.cpp
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #include "WiFiStorage_Generic.h"
diff --git a/src/WiFiStorage_Generic.h b/src/WiFiStorage_Generic.h
index fbf01803..a3dfa2ff 100644
--- a/src/WiFiStorage_Generic.h
+++ b/src/WiFiStorage_Generic.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/WiFiUdp_Generic.cpp b/src/WiFiUdp_Generic.cpp
index 2bf0def7..729518b3 100644
--- a/src/WiFiUdp_Generic.cpp
+++ b/src/WiFiUdp_Generic.cpp
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #include <string.h>
diff --git a/src/WiFiUdp_Generic.h b/src/WiFiUdp_Generic.h
index 416914e5..371ccc9d 100644
--- a/src/WiFiUdp_Generic.h
+++ b/src/WiFiUdp_Generic.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/WiFi_Generic.cpp b/src/WiFi_Generic.cpp
index 894faf75..0c7756f1 100644
--- a/src/WiFi_Generic.cpp
+++ b/src/WiFi_Generic.cpp
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #include "utility/wifi_drv.h"
diff --git a/src/WiFi_Generic.h b/src/WiFi_Generic.h
index a12b2a41..8786f18d 100644
--- a/src/WiFi_Generic.h
+++ b/src/WiFi_Generic.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
@@ -55,12 +56,12 @@
 // To eliminate FW warning when using not latest nina-fw version
 // To use whenever WiFi101-FirmwareUpdater-Plugin is not sync'ed with nina-fw version
 #if !defined(WIFI_FIRMWARE_LATEST_VERSION)
-  #define WIFI_FIRMWARE_LATEST_VERSION        "1.4.7"
+  #define WIFI_FIRMWARE_LATEST_VERSION        "1.4.8"
 #endif
 
 #define WIFI_HAS_FEED_WATCHDOG_FUNC
 
-#define WIFININA_GENERIC_VERSION            "WiFiNINA_Generic v1.8.12"
+#define WIFININA_GENERIC_VERSION            "WiFiNINA_Generic v1.8.13"
 
 #include <inttypes.h>
 
diff --git a/src/utility/WiFiSocketBuffer.cpp b/src/utility/WiFiSocketBuffer.cpp
index 91ea405f..8113e86e 100644
--- a/src/utility/WiFiSocketBuffer.cpp
+++ b/src/utility/WiFiSocketBuffer.cpp
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #include <stdlib.h>
diff --git a/src/utility/WiFiSocketBuffer.h b/src/utility/WiFiSocketBuffer.h
index 35b21e33..96c8211d 100644
--- a/src/utility/WiFiSocketBuffer.h
+++ b/src/utility/WiFiSocketBuffer.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/utility/debug.h b/src/utility/debug.h
index 9c9d435d..2c984f34 100644
--- a/src/utility/debug.h
+++ b/src/utility/debug.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/utility/nano_rp2040_support.cpp b/src/utility/nano_rp2040_support.cpp
index c41735ff..fdc7d0f0 100644
--- a/src/utility/nano_rp2040_support.cpp
+++ b/src/utility/nano_rp2040_support.cpp
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 //#ifdef ARDUINO_NANO_RP2040_CONNECT
diff --git a/src/utility/server_drv.cpp b/src/utility/server_drv.cpp
index 58d703ab..5410720d 100644
--- a/src/utility/server_drv.cpp
+++ b/src/utility/server_drv.cpp
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #define _DEBUG_
diff --git a/src/utility/server_drv.h b/src/utility/server_drv.h
index 5a4e5cec..8f913330 100644
--- a/src/utility/server_drv.h
+++ b/src/utility/server_drv.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/utility/spi_drv.cpp b/src/utility/spi_drv.cpp
index b008cfaf..05f5d936 100644
--- a/src/utility/spi_drv.cpp
+++ b/src/utility/spi_drv.cpp
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #include "Arduino.h"
diff --git a/src/utility/spi_drv.h b/src/utility/spi_drv.h
index 41c44e56..1064d991 100644
--- a/src/utility/spi_drv.h
+++ b/src/utility/spi_drv.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/utility/wifi_drv.cpp b/src/utility/wifi_drv.cpp
index 42d79889..b5709d21 100644
--- a/src/utility/wifi_drv.cpp
+++ b/src/utility/wifi_drv.cpp
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #include <stdio.h>
diff --git a/src/utility/wifi_drv.h b/src/utility/wifi_drv.h
index e27f4952..0af3736e 100644
--- a/src/utility/wifi_drv.h
+++ b/src/utility/wifi_drv.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/utility/wifi_spi.h b/src/utility/wifi_spi.h
index cae48225..b01e0315 100644
--- a/src/utility/wifi_spi.h
+++ b/src/utility/wifi_spi.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/utility/wl_definitions.h b/src/utility/wl_definitions.h
index 285e44ad..41b1ec5e 100644
--- a/src/utility/wl_definitions.h
+++ b/src/utility/wl_definitions.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once
diff --git a/src/utility/wl_types.h b/src/utility/wl_types.h
index 4bf8d7ae..95308c4b 100644
--- a/src/utility/wl_types.h
+++ b/src/utility/wl_types.h
@@ -24,7 +24,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   
-  Version: 1.8.12
+  Version: 1.8.13
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -48,6 +48,7 @@
   1.8.10-1   K Hoang    29/05/2021 Fix PinStatus compile error for some platforms
   1.8.11     K Hoang    14/06/2021 Sync with WiFiNINA v1.8.11 : Support RP2040, new FW v1.4.6
   1.8.12     K Hoang    30/06/2021 Sync with WiFiNINA v1.8.12 : new FW v1.4.7. Add support to most AVR boards.
+  1.8.13     K Hoang    03/08/2021 Sync with WiFiNINA v1.8.13 : new FW v1.4.8. Add support to ADAFRUIT_MATRIXPORTAL_M4_EXPRESS
  ***********************************************************************************************************************************/
 
 #pragma once