diff --git a/.travis.yml b/.travis.yml
index 97f3609..4bc7701 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,11 +23,11 @@ before_install:
     fi
   - arduino --pref "boardsmanager.additional.urls=" --save-prefs
 install:
-  - arduino --install-library "U8g2"
+  - arduino --install-library "U8g2","FlashStorage"
 script:
   - cp -f $PWD/crossbow/configurations/config_${CONFIG}.h $PWD/crossbow/config.h &&
     arduino --verify --board $BOARD $PWD/crossbow/crossbow.ino
 notifications:
   email:
     on_success: change
-    on_failure: change
\ No newline at end of file
+    on_failure: change
diff --git a/README.md b/README.md
index b16c32a..19e78d8 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ Needs implementation:
 To compile, following libraries have to be installed:
 
 * [U8g2](https://github.com/olikraus/u8g2) for OLED support in TX module
+* [FlashStorage](https://github.com/cmaglie/FlashStorage) for EEPROM-Emulation if using a SAMD-Board (M0 etc.)
 
 # Protocol
 
@@ -147,4 +148,4 @@ After flashing TX and RX, binding is required.
 
 # RX module connection diagram
 
-![Diagram](docs/RX_module_schem.png)
\ No newline at end of file
+![Diagram](docs/RX_module_schem.png)
diff --git a/crossbow/platform_node.cpp b/crossbow/platform_node.cpp
index 69fd688..c5fd45b 100644
--- a/crossbow/platform_node.cpp
+++ b/crossbow/platform_node.cpp
@@ -20,6 +20,9 @@ void PlatformNode::seed(void) {
         EEPROM.write(EEPROM_ADDRESS_BIND_2, random(1, 255)); //Yes, from 1 to 254
         EEPROM.write(EEPROM_ADDRESS_BIND_3, random(1, 255)); //Yes, from 1 to 254
         EEPROM.write(EEPROM_ADDRESS_BIND_KEY_SEEDED, 0xf1);
+        #ifdef ARDUINO_SAMD_FEATHER_M0
+        EEPROM.commit();
+        #endif
     } 
 }
 
@@ -36,6 +39,9 @@ void PlatformNode::saveBindKey(uint8_t key[]) {
     EEPROM.write(EEPROM_ADDRESS_BIND_2, key[2]);
     EEPROM.write(EEPROM_ADDRESS_BIND_3, key[3]);
     EEPROM.write(EEPROM_ADDRESS_BIND_KEY_SEEDED, 0xf1);
+    #ifdef ARDUINO_SAMD_FEATHER_M0
+    EEPROM.commit();
+    #endif
 }
 
 int PlatformNode::getRcChannel(uint8_t channel) {
@@ -75,4 +81,4 @@ void PlatformNode::leaveBindMode(void) {
     isBindMode = false;
     loadBindKey(bindKey);
     radioNode.reset();
-}
\ No newline at end of file
+}
diff --git a/crossbow/platform_node.h b/crossbow/platform_node.h
index 3728c59..b0f1820 100644
--- a/crossbow/platform_node.h
+++ b/crossbow/platform_node.h
@@ -2,7 +2,12 @@
 
 #include "Arduino.h"
 #include "radio_node.h"
+#ifdef ARDUINO_AVR_FEATHER32U4
 #include <EEPROM.h>
+#elif defined(ARDUINO_SAMD_FEATHER_M0)
+// Include EEPROM-like API for FlashStorage
+#include <FlashAsEEPROM.h>
+#endif
 
 #ifndef PLATFORM_NODE_H
 #define PLATFORM_NODE_H
@@ -48,4 +53,4 @@ class PlatformNode {
         volatile int _channels[PLATFORM_TOTAL_CHANNEL_COUNT];
 };
 
-#endif
\ No newline at end of file
+#endif