diff --git a/CI/scripts/Makefile b/CI/scripts/Makefile
index c66d753..78a4ef2 100644
--- a/CI/scripts/Makefile
+++ b/CI/scripts/Makefile
@@ -1,7 +1,7 @@
 # Usage:
-#	make <MATLAB release version ex: R2018b> <HDL git branch ex: hdl_2018_r1>
+#	make <target> MLRELEASE=<MATLAB release version ex: R2018b> HDLBRANCH=<HDL git branch ex: hdl_2018_r1>
 # Example
-#	make R2018b hdl_2018_r1
+#	make build MLRELEASE=R2018b HDLBRANCH=hdl_2018_r1
 
 ifeq ($(MLRELEASE),)
 MLRELEASE := R2018b
@@ -11,6 +11,19 @@ ifeq ($(HDLBRANCH),)
 HDLBRANCH := hdl_2018_r1
 endif
 
+ifeq ($(OS),Windows_NT)
+$(error Build system does not currently support Windows)
+else
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Linux)
+MLPATH := /usr/local/MATLAB
+endif
+ifeq ($(UNAME_S),Darwin)
+MLPATH := /Applications
+MLRELEASE := MATLAB_${MLRELEASE}.app
+endif
+endif
+
 GITTAG := $(shell git describe --tags HEAD)
 
 .ONESHELL:
@@ -19,59 +32,65 @@ build:
 	bash build_bsp.sh
 
 add_libad9361:
-	cd ../..
-	mkdir deps
-	cd deps
-	# Linux
-	mkdir linux
-	cd linux
-	#curl --silent "https://api.github.com/repos/analogdevicesinc/libad9361-iio/releases/latest" | jq -r ".assets[] | select(.name | test(\"${spruce_type}\")) | .browser_download_url" | grep tar.gz | wget -i -
-	wget http://swdownloads.analog.com/cse/travis_builds/master_latest_libad9361-iio-trusty.tar.gz
-	tar xvf *.tar.gz
-	mv usr/local/lib/* .
-	mv usr/local/include ../
-	rm -rf usr
-	rm *.tar.gz
-	cd ..
-	# Windows
-	mkdir win
-	cd win
-	wget "https://ci.appveyor.com/api/projects/analogdevicesinc/libad9361-iio/artifacts/libad9361-win64.zip?branch=master" -O lib.zip
-	unzip lib.zip
-	mv libad9361-win64/* .
-	rm -rf libad9361-win64
-	rm *.h
+	cd ../.. ; \
+	mkdir deps ; \
+	cd deps ; \
+	mkdir linux ; \
+	cd linux ; \
+	wget http://swdownloads.analog.com/cse/travis_builds/master_latest_libad9361-iio-trusty.tar.gz ; \
+	tar xvf *.tar.gz ; \
+	mv usr/local/lib/* . ; \
+	mv usr/local/include ../ ; \
+	rm -rf usr ; \
+	rm *.tar.gz ; \
+	cd .. ; \
+	mkdir osx ; \
+	cd osx ; \
+	wget http://swdownloads.analog.com/cse/travis_builds/master_latest_libad9361-iio-osx_10.12.tar.gz ; \
+	tar xvf *.tar.gz ; \
+	cd ad9361* ; \
+	mv usr/local/lib/ad9361.framework/Versions/Current/ad9361 ../libad9361.dylib ; \
+	cd .. ; \
+	rm -rf ad9361-*-Darwin ; \
+	rm *.tar.gz ; \
+	cd .. ; \
+	mkdir win ; \
+	cd win ; \
+	wget "https://ci.appveyor.com/api/projects/analogdevicesinc/libad9361-iio/artifacts/libad9361-win64.zip?branch=master" -O lib.zip ; \
+	unzip lib.zip ; \
+	mv libad9361-win64/* . ; \
+	rm -rf libad9361-win64 ; \
+	rm *.h ; \
 	rm lib.zip
 
 test_installer:
-	cd ../..
-	cp *.mltbx test/
-	cp hdl_wa_bsp/vendor/AnalogDevices/hdlcoder_board_customization.m test/hdlcoder_board_customization_local.m
-	sed -i "s/hdlcoder_board_customization/hdlcoder_board_customization_local/g" test/hdlcoder_board_customization_local.m
-	/usr/local/MATLAB/$(MLRELEASE)/bin/matlab -nodisplay -r "cd('test');runInstallerTests;"
+	cd ../.. ; \
+	cp *.mltbx test/ ; \
+	cp hdl_wa_bsp/vendor/AnalogDevices/hdlcoder_board_customization.m test/hdlcoder_board_customization_local.m ; \
+	sed -i "s/hdlcoder_board_customization/hdlcoder_board_customization_local/g" test/hdlcoder_board_customization_local.m ; \
+	${MLPATH}/$(MLRELEASE)/bin/matlab -nodisplay -r "cd('test');runInstallerTests;"
 
 test:
-	cd ../..
-	cp hdl_wa_bsp/vendor/AnalogDevices/hdlcoder_board_customization.m test/hdlcoder_board_customization_local.m
-	sed -i "s/hdlcoder_board_customization/hdlcoder_board_customization_local/g" test/hdlcoder_board_customization_local.m
-	/usr/local/MATLAB/$(MLRELEASE)/bin/matlab -nodisplay -r "cd('test');runTests;"
+	cd ../.. ; \
+	cp hdl_wa_bsp/vendor/AnalogDevices/hdlcoder_board_customization.m test/hdlcoder_board_customization_local.m ; \
+	sed -i "s/hdlcoder_board_customization/hdlcoder_board_customization_local/g" test/hdlcoder_board_customization_local.m ; \
+	${MLPATH}/$(MLRELEASE)/bin/matlab -nodisplay -r "cd('test');runTests;"
 
 test_streaming:
-	cd ../..
-	/usr/local/MATLAB/$(MLRELEASE)/bin/matlab -nodisplay -r "addpath(genpath('test'));addpath(genpath('deps'));hwTestRunner;"
+	cd ../.. ; \
+	${MLPATH}/$(MLRELEASE)/bin/matlab -nodisplay -r "addpath(genpath('test'));addpath(genpath('deps'));hwTestRunner;"
 
 test_modem:
-	cd ../..
-	/usr/local/MATLAB/$(MLRELEASE)/bin/matlab -nodisplay -r "addpath(genpath('hdl_wa_bsp'));cd('targeting_models');addpath(genpath('modem-qpsk'))"
+	cd ../.. ; \
+	${MLPATH}/$(MLRELEASE)/bin/matlab -nodisplay -r "addpath(genpath('hdl_wa_bsp'));cd('targeting_models');addpath(genpath('modem-qpsk'))"
 
 gen_tlbx:
-	/usr/local/MATLAB/$(MLRELEASE)/bin/matlab -nodisplay -r "genTlbx;exit();"
+	${MLPATH}/$(MLRELEASE)/bin/matlab -nodisplay -r "genTlbx;exit();"
 
 linter:
-	/usr/local/MATLAB/$(MLRELEASE)/bin/matlab -nodisplay -r "linter;exit();"
+	${MLPATH}/$(MLRELEASE)/bin/matlab -nodisplay -r "linter;exit();"
 
 zip:
-	cd ../..
-	mkdir zip
+	cd ../.. ; \
+	mkdir zip ; \
 	zip -r zip/AnalogDevicesBSP_$(GITTAG).zip deps doc hdl_wa_bsp hil_models targeting_models info.xml LICENSE README.md test/*.log
-