diff --git a/app/app.pro b/app/app.pro
index 73eeec042..1e5ddada7 100644
--- a/app/app.pro
+++ b/app/app.pro
@@ -27,6 +27,8 @@ LIBS += -L../logging/$${build_subdir} -llogging
 CONFIG(ANDROID):CONFIG += mobility
 CONFIG(ANDROID):MOBILITY =
 
+RC_ICONS = ../sdrgui/resources/sdrangel_icon.ico
+
 macx {
     QMAKE_TARGET_BUNDLE_PREFIX = org.f4exb
     QMAKE_BUNDLE = SDRangel
diff --git a/app/main.cpp b/app/main.cpp
index e2610a494..f197cf1d5 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -27,7 +27,7 @@
 #include "mainwindow.h"
 #include "dsp/dsptypes.h"
 #ifdef _MSC_VER
-#define GIT_COMMIT_HASH_STR "v4.8.0"
+#define GIT_COMMIT_HASH_STR "v4.8.1"
 #else
 #include "sdrangel_version.h"
 #endif
diff --git a/devices/soapysdr/devicesoapysdrscan.cpp b/devices/soapysdr/devicesoapysdrscan.cpp
index 7dfbb5378..61bb5fbbd 100644
--- a/devices/soapysdr/devicesoapysdrscan.cpp
+++ b/devices/soapysdr/devicesoapysdrscan.cpp
@@ -73,11 +73,6 @@ void DeviceSoapySDRScan::scan()
                 m_deviceEnums.back().m_label = QString("%1-%2").arg(m_deviceEnums.back().m_driverName).arg(deviceSeq);
             }
 
-            qDebug("DeviceSoapySDRScan::scan: %s #%u %s",
-                    m_deviceEnums.back().m_driverName.toStdString().c_str(),
-                    deviceSeq,
-                    m_deviceEnums.back().m_label.toStdString().c_str());
-
             if ((kargIt = kit->find("serial")) != kit->end())
             {
                 m_deviceEnums.back().m_idKey = QString(kargIt->first.c_str());
@@ -94,6 +89,13 @@ void DeviceSoapySDRScan::scan()
                 m_deviceEnums.back().m_idValue = QString(kargIt->second.c_str());
             }
 
+            qDebug("DeviceSoapySDRScan::scan: %s #%u %s id: %s=%s",
+                    m_deviceEnums.back().m_driverName.toStdString().c_str(),
+                    deviceSeq,
+                    m_deviceEnums.back().m_label.toStdString().c_str(),
+                    m_deviceEnums.back().m_idKey.toStdString().c_str(),
+                    m_deviceEnums.back().m_idValue.toStdString().c_str());
+
             // access the device to get the number of Rx and Tx channels and at the same time probe
             // whether it is available for Soapy
 
diff --git a/plugins/samplesource/filesource/filesourceinput.cpp b/plugins/samplesource/filesource/filesourceinput.cpp
index 470d70e5a..229b42d11 100644
--- a/plugins/samplesource/filesource/filesourceinput.cpp
+++ b/plugins/samplesource/filesource/filesourceinput.cpp
@@ -181,7 +181,7 @@ bool FileSourceInput::start()
 	QMutexLocker mutexLocker(&m_mutex);
 	qDebug() << "FileSourceInput::start";
 
-	if (m_ifstream.tellg() != 0) {
+	if (m_ifstream.tellg() != (std::streampos)0) {
 		m_ifstream.clear();
 		m_ifstream.seekg(sizeof(FileRecord::Header), std::ios::beg);
 	}
diff --git a/pluginssrv/samplesource/perseus/CMakeLists.txt b/pluginssrv/samplesource/perseus/CMakeLists.txt
index 732db4f69..3bbee95b0 100644
--- a/pluginssrv/samplesource/perseus/CMakeLists.txt
+++ b/pluginssrv/samplesource/perseus/CMakeLists.txt
@@ -22,7 +22,8 @@ include_directories(
     .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${CMAKE_SOURCE_DIR}/devices        
+    ${CMAKE_SOURCE_DIR}/devices
+    ${LIBUSB_INCLUDE_DIR}
     ${LIBPERSEUSSRC}
     ${LIBPERSEUSSRC}/libperseus/src
 )
@@ -31,7 +32,8 @@ include_directories(
     .
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
-    ${CMAKE_SOURCE_DIR}/devices        
+    ${CMAKE_SOURCE_DIR}/devices
+    ${LIBUSB_INCLUDE_DIR}
     ${LIBPERSEUS_INCLUDE_DIR}
 )
 endif (BUILD_DEBIAN)
@@ -48,6 +50,7 @@ add_library(inputperseussrv SHARED
 if (BUILD_DEBIAN)
 target_link_libraries(inputperseussrv
     ${QT_LIBRARIES}
+    ${LIBUSB_LIBRARIES}
     perseus
     sdrbase
     swagger
@@ -56,6 +59,7 @@ target_link_libraries(inputperseussrv
 else (BUILD_DEBIAN)
 target_link_libraries(inputperseussrv
     ${QT_LIBRARIES}
+    ${LIBUSB_LIBRARIES}
     ${LIBPERSEUS_LIBRARIES}
     sdrbase
     swagger
diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro
index 9619d5d95..15b80b402 100644
--- a/sdrbase/sdrbase.pro
+++ b/sdrbase/sdrbase.pro
@@ -82,6 +82,7 @@ SOURCES += audio/audiodevicemanager.cpp\
         dsp/decimatorsfi.cpp\
         dsp/dspcommands.cpp\
         dsp/dspengine.cpp\
+        dsp/dspdevicemimoengine.cpp\
         dsp/dspdevicesourceengine.cpp\
         dsp/dspdevicesinkengine.cpp\
         dsp/fftengine.cpp\
@@ -114,6 +115,7 @@ SOURCES += audio/audiodevicemanager.cpp\
         dsp/wfir.cpp\
         dsp/devicesamplesource.cpp\
         dsp/devicesamplesink.cpp\
+        dsp/devicesamplemimo.cpp\
         settings/preferences.cpp\
         settings/preset.cpp\
         settings/mainsettings.cpp\
@@ -165,6 +167,7 @@ HEADERS  += audio/audiodevicemanager.h\
         dsp/interpolators.h\
         dsp/dspcommands.h\
         dsp/dspengine.h\
+        dsp/dspdevicemimoengine.h\
         dsp/dspdevicesourceengine.h\
         dsp/dspdevicesinkengine.h\
         dsp/dsptypes.h\
@@ -212,6 +215,7 @@ HEADERS  += audio/audiodevicemanager.h\
         dsp/wfir.h\
         dsp/devicesamplesource.h\
         dsp/devicesamplesink.h\
+        dsp/devicesamplemimo.h\
         plugin/plugininstancegui.h\
         plugin/plugininterface.h\
         plugin/pluginapi.h\
diff --git a/sdrgui/sdrgui.pro b/sdrgui/sdrgui.pro
index a0940ab17..cfea4717f 100644
--- a/sdrgui/sdrgui.pro
+++ b/sdrgui/sdrgui.pro
@@ -59,6 +59,7 @@ SOURCES += mainwindow.cpp\
         gui/commandoutputdialog.cpp\
         gui/crightclickenabler.cpp\
         gui/cwkeyergui.cpp\
+        gui/devicestreamselectiondialog.cpp\
         gui/editcommanddialog.cpp\
         gui/externalclockbutton.cpp\
         gui/externalclockdialog.cpp\
@@ -79,6 +80,7 @@ SOURCES += mainwindow.cpp\
         gui/rollupwidget.cpp\
         gui/samplingdevicecontrol.cpp\
         gui/samplingdevicedialog.cpp\
+        gui/sdrangelsplash.cpp\
         gui/mypositiondialog.cpp\
         gui/scaleengine.cpp\
         gui/transverterbutton.cpp\
@@ -119,6 +121,7 @@ HEADERS  += mainwindow.h\
         gui/commandoutputdialog.h\
         gui/crightclickenabler.h\
         gui/cwkeyergui.h\
+        gui/devicestreamselectiondialog.h\
         gui/editcommanddialog.h\
         gui/externalclockbutton.h\
         gui/externalclockdialog.h\
@@ -138,6 +141,7 @@ HEADERS  += mainwindow.h\
         gui/rollupwidget.h\
         gui/samplingdevicecontrol.h\
         gui/samplingdevicedialog.h\
+        gui/sdrangelsplash.h\
         gui/mypositiondialog.h\
         gui/scaleengine.h\
         gui/tickedslider.h\