diff --git a/dfu/dfu.iml b/dfu/dfu.iml
index 6c25b3a..90a2c9a 100644
--- a/dfu/dfu.iml
+++ b/dfu/dfu.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../nRFBeacon" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../nRFMasterControlPanel" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
diff --git a/dfu/src/main/java/no/nordicsemi/android/error/GattError.java b/dfu/src/main/java/no/nordicsemi/android/error/GattError.java
index bdb3730..47d438c 100644
--- a/dfu/src/main/java/no/nordicsemi/android/error/GattError.java
+++ b/dfu/src/main/java/no/nordicsemi/android/error/GattError.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2013 Nordic Semiconductor. All Rights Reserved.
- * 
+ *
  * The information contained herein is property of Nordic Semiconductor ASA.
  * Terms and conditions of usage are described in detail in NORDIC SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
  * Licensees are granted free, non-transferable use of the information. NO WARRANTY of ANY KIND is provided. 
@@ -14,110 +14,112 @@ public class GattError {
 
 	public static String parse(final int error) {
 		switch (error) {
-		case 0x0001:
-			return "GATT INVALID HANDLE";
-		case 0x0002:
-			return "GATT READ NOT PERMIT";
-		case 0x0003:
-			return "GATT WRITE NOT PERMIT";
-		case 0x0004:
-			return "GATT INVALID PDU";
-		case 0x0005:
-			return "GATT INSUF AUTHENTICATION";
-		case 0x0006:
-			return "GATT REQ NOT SUPPORTED";
-		case 0x0007:
-			return "GATT INVALID OFFSET";
-		case 0x0008:
-			return "GATT INSUF AUTHORIZATION";
-		case 0x0009:
-			return "GATT PREPARE Q FULL";
-		case 0x000a:
-			return "GATT NOT FOUND";
-		case 0x000b:
-			return "GATT NOT LONG";
-		case 0x000c:
-			return "GATT INSUF KEY SIZE";
-		case 0x000d:
-			return "GATT INVALID ATTR LEN";
-		case 0x000e:
-			return "GATT ERR UNLIKELY";
-		case 0x000f:
-			return "GATT INSUF ENCRYPTION";
-		case 0x0010:
-			return "GATT UNSUPPORT GRP TYPE";
-		case 0x0011:
-			return "GATT INSUF RESOURCE";
-		case 0x0087:
-			return "GATT ILLEGAL PARAMETER";
-		case 0x0080:
-			return "GATT NO RESOURCES";
-		case 0x0081:
-			return "GATT INTERNAL ERROR";
-		case 0x0082:
-			return "GATT WRONG STATE";
-		case 0x0083:
-			return "GATT DB FULL";
-		case 0x0084:
-			return "GATT BUSY";
-		case 0x0085:
-			return "GATT ERROR";
-		case 0x0086:
-			return "GATT CMD STARTED";
-		case 0x0088:
-			return "GATT PENDING";
-		case 0x0089:
-			return "GATT AUTH FAIL";
-		case 0x008a:
-			return "GATT MORE";
-		case 0x008b:
-			return "GATT INVALID CFG";
-		case 0x008c:
-			return "GATT SERVICE STARTED";
-		case 0x008d:
-			return "GATT ENCRYPTED NO MITM";
-		case 0x008e:
-			return "GATT NOT ENCRYPTED";
-		case 0x0101:
-			return "TOO MANY OPEN CONNECTIONS";
-		case 0x00FF:
-			return "DFU SERVICE DISCOVERY NOT STARTED";
-		case DfuBaseService.ERROR_DEVICE_DISCONNECTED:
-			return "DFU DEVICE DISCONNECTED";
-		case DfuBaseService.ERROR_FILE_ERROR:
-			return "DFU FILE ERROR";
-		case DfuBaseService.ERROR_FILE_INVALID:
-			return "DFU NOT A VALID HEX FILE";
-		case DfuBaseService.ERROR_FILE_IO_EXCEPTION:
-			return "DFU IO EXCEPTION";
-		case DfuBaseService.ERROR_FILE_NOT_FOUND:
-			return "DFU FILE NOT FOUND";
-		case DfuBaseService.ERROR_SERVICE_DISCOVERY_NOT_STARTED:
-			return "DFU ERROR WHILE SERVICE DISCOVERY";
-		case DfuBaseService.ERROR_SERVICE_NOT_FOUND:
-			return "DFU SERVICE NOT FOUND";
-		case DfuBaseService.ERROR_CHARACTERISTICS_NOT_FOUND:
-			return "DFU CHARACTERISTICS NOT FOUND";
-		case DfuBaseService.ERROR_FILE_TYPE_UNSUPPORTED:
-			return "DFU FILE TYPE NOT SUPPORTED";
-		case DfuBaseService.ERROR_BLUETOOTH_DISABLED:
-			return "BLUETOOTH ADAPTER DISABLED";
-		default:
-			if ((DfuBaseService.ERROR_REMOTE_MASK & error) > 0) {
-				switch (error & (~DfuBaseService.ERROR_REMOTE_MASK)) {
-				case DfuBaseService.DFU_STATUS_INVALID_STATE:
-					return "REMOTE DFU INVALID STATE";
-				case DfuBaseService.DFU_STATUS_NOT_SUPPORTED:
-					return "REMOTE DFU NOT SUPPORTED";
-				case DfuBaseService.DFU_STATUS_DATA_SIZE_EXCEEDS_LIMIT:
-					return "REMOTE DFU DATA SIZE EXCEEDS LIMIT";
-				case DfuBaseService.DFU_STATUS_CRC_ERROR:
-					return "REMOTE DFU INVALID CRC ERROR";
-				case DfuBaseService.DFU_STATUS_OPERATION_FAILED:
-					return "REMOTE DFU OPERATION FAILED";
+			case 0x0001:
+				return "GATT INVALID HANDLE";
+			case 0x0002:
+				return "GATT READ NOT PERMIT";
+			case 0x0003:
+				return "GATT WRITE NOT PERMIT";
+			case 0x0004:
+				return "GATT INVALID PDU";
+			case 0x0005:
+				return "GATT INSUF AUTHENTICATION";
+			case 0x0006:
+				return "GATT REQ NOT SUPPORTED";
+			case 0x0007:
+				return "GATT INVALID OFFSET";
+			case 0x0008:
+				return "GATT INSUF AUTHORIZATION";
+			case 0x0009:
+				return "GATT PREPARE Q FULL";
+			case 0x000a:
+				return "GATT NOT FOUND";
+			case 0x000b:
+				return "GATT NOT LONG";
+			case 0x000c:
+				return "GATT INSUF KEY SIZE";
+			case 0x000d:
+				return "GATT INVALID ATTR LEN";
+			case 0x000e:
+				return "GATT ERR UNLIKELY";
+			case 0x000f:
+				return "GATT INSUF ENCRYPTION";
+			case 0x0010:
+				return "GATT UNSUPPORT GRP TYPE";
+			case 0x0011:
+				return "GATT INSUF RESOURCE";
+			case 0x0087:
+				return "GATT ILLEGAL PARAMETER";
+			case 0x0080:
+				return "GATT NO RESOURCES";
+			case 0x0081:
+				return "GATT INTERNAL ERROR";
+			case 0x0082:
+				return "GATT WRONG STATE";
+			case 0x0083:
+				return "GATT DB FULL";
+			case 0x0084:
+				return "GATT BUSY";
+			case 0x0085:
+				return "GATT ERROR";
+			case 0x0086:
+				return "GATT CMD STARTED";
+			case 0x0088:
+				return "GATT PENDING";
+			case 0x0089:
+				return "GATT AUTH FAIL";
+			case 0x008a:
+				return "GATT MORE";
+			case 0x008b:
+				return "GATT INVALID CFG";
+			case 0x008c:
+				return "GATT SERVICE STARTED";
+			case 0x008d:
+				return "GATT ENCRYPTED NO MITM";
+			case 0x008e:
+				return "GATT NOT ENCRYPTED";
+			case 0x01FF:
+				return "GATT VALUE OUT OF RANGE";
+			case 0x0101:
+				return "TOO MANY OPEN CONNECTIONS";
+			case 0x00FF:
+				return "DFU SERVICE DISCOVERY NOT STARTED";
+			case DfuBaseService.ERROR_DEVICE_DISCONNECTED:
+				return "DFU DEVICE DISCONNECTED";
+			case DfuBaseService.ERROR_FILE_ERROR:
+				return "DFU FILE ERROR";
+			case DfuBaseService.ERROR_FILE_INVALID:
+				return "DFU NOT A VALID HEX FILE";
+			case DfuBaseService.ERROR_FILE_IO_EXCEPTION:
+				return "DFU IO EXCEPTION";
+			case DfuBaseService.ERROR_FILE_NOT_FOUND:
+				return "DFU FILE NOT FOUND";
+			case DfuBaseService.ERROR_SERVICE_DISCOVERY_NOT_STARTED:
+				return "DFU ERROR WHILE SERVICE DISCOVERY";
+			case DfuBaseService.ERROR_SERVICE_NOT_FOUND:
+				return "DFU SERVICE NOT FOUND";
+			case DfuBaseService.ERROR_CHARACTERISTICS_NOT_FOUND:
+				return "DFU CHARACTERISTICS NOT FOUND";
+			case DfuBaseService.ERROR_FILE_TYPE_UNSUPPORTED:
+				return "DFU FILE TYPE NOT SUPPORTED";
+			case DfuBaseService.ERROR_BLUETOOTH_DISABLED:
+				return "BLUETOOTH ADAPTER DISABLED";
+			default:
+				if ((DfuBaseService.ERROR_REMOTE_MASK & error) > 0) {
+					switch (error & (~DfuBaseService.ERROR_REMOTE_MASK)) {
+						case DfuBaseService.DFU_STATUS_INVALID_STATE:
+							return "REMOTE DFU INVALID STATE";
+						case DfuBaseService.DFU_STATUS_NOT_SUPPORTED:
+							return "REMOTE DFU NOT SUPPORTED";
+						case DfuBaseService.DFU_STATUS_DATA_SIZE_EXCEEDS_LIMIT:
+							return "REMOTE DFU DATA SIZE EXCEEDS LIMIT";
+						case DfuBaseService.DFU_STATUS_CRC_ERROR:
+							return "REMOTE DFU INVALID CRC ERROR";
+						case DfuBaseService.DFU_STATUS_OPERATION_FAILED:
+							return "REMOTE DFU OPERATION FAILED";
+					}
 				}
-			}
-			return "UNKNOWN (" + error + ")";
+				return "UNKNOWN (" + error + ")";
 		}
 	}
 }