diff --git a/ShimmerBluetoothManager/src/main/java/com/shimmerresearch/managers/bluetoothManager/ShimmerBluetoothManager.java b/ShimmerBluetoothManager/src/main/java/com/shimmerresearch/managers/bluetoothManager/ShimmerBluetoothManager.java
index 5e9017487..a68b024ec 100644
--- a/ShimmerBluetoothManager/src/main/java/com/shimmerresearch/managers/bluetoothManager/ShimmerBluetoothManager.java
+++ b/ShimmerBluetoothManager/src/main/java/com/shimmerresearch/managers/bluetoothManager/ShimmerBluetoothManager.java
@@ -491,7 +491,7 @@ public ShimmerDevice getShimmerDeviceBtConnectedFromMac(String macAddress){
 		Iterator<ShimmerDevice> iterator = mMapOfBtConnectedShimmers.values().iterator();
 		while(iterator.hasNext()){
 			ShimmerDevice shimmerDevice = iterator.next();
-			if(shimmerDevice.getMacId().equals(macAddress)){
+			if(shimmerDevice.getMacId().toUpperCase().equals(macAddress.toUpperCase())){
 				return shimmerDevice;
 			}
 		}
diff --git a/ShimmerPCBasicExamples/src/main/java/com/shimmerresearch/simpleexamples/SensorMapsExample.java b/ShimmerPCBasicExamples/src/main/java/com/shimmerresearch/simpleexamples/SensorMapsExample.java
index 41b98690f..d1d3d9714 100644
--- a/ShimmerPCBasicExamples/src/main/java/com/shimmerresearch/simpleexamples/SensorMapsExample.java
+++ b/ShimmerPCBasicExamples/src/main/java/com/shimmerresearch/simpleexamples/SensorMapsExample.java
@@ -286,7 +286,12 @@ public void actionPerformed(ActionEvent arg0) {
 				}
 				
 				try {
-					ShimmerDevice device = btManager.getShimmerDeviceBtConnected(btComport);
+					ShimmerDevice device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
+					if (btComport.contains(PREFIX_COM) || btComport.contains(PREFIX_DEV)) {
+						device = btManager.getShimmerDeviceBtConnected(btComport);
+					} else {
+						device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
+					}
 					if (device instanceof VerisenseDevice) {
 						((VerisenseDevice)device).startStreaming();
 					}else{
@@ -418,7 +423,7 @@ public void actionPerformed(ActionEvent e) {
 		frame.getContentPane().add(lblFilePath);
 		
 		chckbxWriteDataToFile = new JCheckBox("Write Data to File");
-		chckbxWriteDataToFile.setBounds(829, 185, 242, 23);
+		chckbxWriteDataToFile.setBounds(829, 185, 116, 23);
 		chckbxWriteDataToFile.addItemListener(new ItemListener() {
             public void itemStateChanged(ItemEvent e) {
                 if(e.getStateChange() == ItemEvent.SELECTED) {
@@ -429,6 +434,46 @@ public void itemStateChanged(ItemEvent e) {
             }
         });
 		frame.getContentPane().add(chckbxWriteDataToFile);
+		
+		JButton btnStartSDLogging = new JButton("START SD");
+		btnStartSDLogging.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				ShimmerDevice device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
+				if (btComport.contains(PREFIX_COM) || btComport.contains(PREFIX_DEV)) {
+					device = btManager.getShimmerDeviceBtConnected(btComport);
+				} else {
+					device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
+				}
+				if (device instanceof VerisenseDevice) {
+					((VerisenseDevice)device).startSDLogging();
+				}else{
+					((ShimmerBluetooth)device).startSDLogging();
+				}
+			}
+		});
+		btnStartSDLogging.setBounds(951, 181, 91, 31);
+		frame.getContentPane().add(btnStartSDLogging);
+		
+		JButton btnStopSd = new JButton("STOP SD");
+		btnStopSd.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+
+				ShimmerDevice device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
+				if (btComport.contains(PREFIX_COM) || btComport.contains(PREFIX_DEV)) {
+					device = btManager.getShimmerDeviceBtConnected(btComport);
+				} else {
+					device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
+				}
+				if (device instanceof VerisenseDevice) {
+					((VerisenseDevice)device).stopSDLogging();
+				}else{
+					((ShimmerBluetooth)device).stopSDLogging();
+				}
+			
+			}
+		});
+		btnStopSd.setBounds(1043, 181, 82, 31);
+		frame.getContentPane().add(btnStopSd);
 				
 		plotManager.setTitle("Plot");		
 	}
@@ -514,6 +559,8 @@ protected void processMsgFromCallback(ShimmerMsg shimmerMSG) {
 				ShimmerDevice device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
 				if (btComport.contains(PREFIX_COM) || btComport.contains(PREFIX_DEV)) {
 					device = btManager.getShimmerDeviceBtConnected(btComport);
+				} else {
+					device = btManager.getShimmerDeviceBtConnectedFromMac(btComport);
 				}
 				
 				if (device instanceof VerisenseDevice) {