diff --git a/Makefile b/Makefile
index 63b2b017..cea9eeeb 100644
--- a/Makefile
+++ b/Makefile
@@ -29,11 +29,12 @@ INSTALLDIR=install
 # Determine OS
 #
 OS:=$(shell uname -s | cut -c -7)
+OS_SHORT:=$(shell uname -s | cut -c -5)
 
 #
 # Windows rules
 #
-ifeq ($(OS),MINGW32)
+ifeq ($(OS_SHORT),MINGW)
 # Use wxWindows development branch to work around font scaling issues on Windows
 WXVERSION=3.1
 EXE=.exe
diff --git a/README.md b/README.md
index 72b702fd..ecabde0e 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ Supported Device Families
  * SAMS70\*
  * SAMV70\*
  * SAMV71\*
+ * qNimble Quarto\*
 
 \* Device families which are not tested for each release and could stop working.
 
diff --git a/src/Device.cpp b/src/Device.cpp
index 0c94ae44..8e848c45 100644
--- a/src/Device.cpp
+++ b/src/Device.cpp
@@ -418,6 +418,14 @@ Device::create()
         _family = FAMILY_SAMV71;
         flashPtr = new EefcFlash(_samba, "ATSAMV71x21", 0x400000, 4096, 512, 1, 128, 0x20401000, 0x20404000, 0x400e0c00, false);
         break;
+	//
+	// qNimble BOSSA-compatible bootloader
+	//
+	case 0x714e3000:
+        _family = FAMILY_SAM7X;
+        flashPtr = new EfcFlash(_samba, "qNimble BOSSAv1", 0x300000, 32768, 256, 1, 32, 0x202000, 0x220000, true);
+
+        break;
     //
     // No CHIPID devices
     //
diff --git a/src/EfcFlash.cpp b/src/EfcFlash.cpp
index 9b212385..81b0c217 100644
--- a/src/EfcFlash.cpp
+++ b/src/EfcFlash.cpp
@@ -65,7 +65,7 @@ EfcFlash::EfcFlash(Samba& samba,
       _canBootFlash(canBootFlash)
 {
     assert(planes == 1 || planes == 2);
-    assert(pages <= planes * 1024);
+    assert(pages <= planes * 65536);
     assert(lockRegions <= 32);
 
     eraseAuto(true);