diff --git a/.github/workflows/BuildOSX.yml b/.github/workflows/BuildOSX.yml
new file mode 100644
index 0000000..27a9eb4
--- /dev/null
+++ b/.github/workflows/BuildOSX.yml
@@ -0,0 +1,35 @@
+name: BuildOSX
+
+on:
+  push:
+    branches:
+      - osx
+
+jobs:
+  PC_Application_OSX:
+    runs-on: macos-10.15
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Install dependencies
+        run: |
+          brew install qt libusb
+          
+      - name: Set Environment
+        run: |
+          echo "/usr/local/opt/qt/bin" >> $GITHUB_PATH
+          
+      - name: Build application
+        run: |
+          cd Software/PC_Application
+          qmake
+          make -j9
+          macdeployqt VNA2.app
+          zip -ry vna2-app.zip VNA2.app
+        shell: bash
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: Application_OSX
+          path: Software/PC_Application/vna2-app.zip
diff --git a/Software/PC_Application/Application.pro b/Software/PC_Application/Application.pro
index 38badf3..e367fd2 100644
--- a/Software/PC_Application/Application.pro
+++ b/Software/PC_Application/Application.pro
@@ -225,6 +225,8 @@ SOURCES += \
 LIBS += -lusb-1.0
 unix:LIBS += -L/usr/lib/
 win32:LIBS += -L"$$_PRO_FILE_PWD_" # Github actions placed libusb here
+osx:INCPATH += /usr/local/include
+osx:LIBS += $(shell pkg-config --libs libusb-1.0)
 
 QT += widgets
 
@@ -274,9 +276,10 @@ DISTFILES +=
 RESOURCES += \
     icons.qrc
 
-CONFIG += c++14
+CONFIG += c++17
 REVISION = $$system(git rev-parse HEAD)
 DEFINES += GITHASH=\\"\"$$REVISION\\"\"
 DEFINES += FW_MAJOR=0 FW_MINOR=1 FW_PATCH=0 FW_SUFFIX=\\"\"-alpha.2\\"\"
 DEFINES -= _UNICODE UNICODE
 
+TARGET=VNA2
diff --git a/Software/PC_Application/averaging.h b/Software/PC_Application/averaging.h
index af9499a..7745b3b 100644
--- a/Software/PC_Application/averaging.h
+++ b/Software/PC_Application/averaging.h
@@ -3,6 +3,7 @@
 
 
 #include "Device/device.h"
+#include <array>
 #include <deque>
 #include <complex>