diff --git a/include/usbd_gs_can.h b/include/usbd_gs_can.h
index b5ce5d5..1ba7d2c 100644
--- a/include/usbd_gs_can.h
+++ b/include/usbd_gs_can.h
@@ -38,3 +38,4 @@ void USBD_GS_CAN_SetChannel(USBD_HandleTypeDef *pdev, uint8_t channel, CAN_Handl
 bool USBD_GS_CAN_TxReady(USBD_HandleTypeDef *pdev);
 uint8_t USBD_GS_CAN_Transmit(USBD_HandleTypeDef *pdev, uint8_t *buf, uint16_t len);
 uint8_t USBD_GS_CAN_PrepareReceive(USBD_HandleTypeDef *pdev);
+bool USBD_GS_CAN_CustomDeviceRequest(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req);
diff --git a/src/usbd_conf.c b/src/usbd_conf.c
index 48bf806..aa0e77a 100644
--- a/src/usbd_conf.c
+++ b/src/usbd_conf.c
@@ -36,7 +36,7 @@
 #include "stm32f0xx_hal.h"
 #include "usbd_def.h"
 #include "usbd_core.h"
-
+#include <stdbool.h>
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
 /* Private macro -------------------------------------------------------------*/
@@ -105,7 +105,21 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef* hpcd)
   */
 void HAL_PCD_SetupStageCallback(PCD_HandleTypeDef *hpcd)
 {
-  USBD_LL_SetupStage((USBD_HandleTypeDef*)hpcd->pData, (uint8_t *)hpcd->Setup);
+	USBD_HandleTypeDef *pdev = (USBD_HandleTypeDef*)hpcd->pData;
+	USBD_ParseSetupRequest((USBD_SetupReqTypedef*)&pdev->request, (uint8_t*)hpcd->Setup);
+
+	bool request_was_handled = false;
+
+	if ((pdev->request.bmRequest & 0x1F) == USB_REQ_RECIPIENT_DEVICE ) { // device request
+
+		request_was_handled = USBD_GS_CAN_CustomDeviceRequest(pdev, &pdev->request);
+
+	}
+
+	if (!request_was_handled) {
+		USBD_LL_SetupStage((USBD_HandleTypeDef*)hpcd->pData, (uint8_t *)hpcd->Setup);
+	}
+
 }
 
 /**
@@ -116,7 +130,8 @@ void HAL_PCD_SetupStageCallback(PCD_HandleTypeDef *hpcd)
   */
 void HAL_PCD_DataOutStageCallback(PCD_HandleTypeDef *hpcd, uint8_t epnum)
 {
-  USBD_LL_DataOutStage((USBD_HandleTypeDef*)hpcd->pData, epnum, hpcd->OUT_ep[epnum].xfer_buff);
+
+	USBD_LL_DataOutStage((USBD_HandleTypeDef*)hpcd->pData, epnum, hpcd->OUT_ep[epnum].xfer_buff);
 }
 
 /**
diff --git a/src/usbd_gs_can.c b/src/usbd_gs_can.c
index 569e8f4..debd1e8 100644
--- a/src/usbd_gs_can.c
+++ b/src/usbd_gs_can.c
@@ -151,16 +151,35 @@ __ALIGN_BEGIN uint8_t USBD_GS_CAN_CfgDesc[USB_CAN_CONFIG_DESC_SIZ] __ALIGN_END =
 /* Microsoft OS String Descriptor */
 __ALIGN_BEGIN uint8_t USBD_GS_CAN_WINUSB_STR[] __ALIGN_END =
 {
-		0x12,                    /* length */
-		0x03,                    /* descriptor type == string */
-		0x4D, 0x00, 0x53, 0x00,  /* signature: "MSFT100" */
-		0x46, 0x00, 0x54, 0x00,
-		0x31, 0x00, 0x30, 0x00,
-		0x30, 0x00,
-		USBD_GS_CAN_VENDOR_CODE, /* vendor code */
-		0x00                     /* padding */
+	0x12,                    /* length */
+	0x03,                    /* descriptor type == string */
+	0x4D, 0x00, 0x53, 0x00,  /* signature: "MSFT100" */
+	0x46, 0x00, 0x54, 0x00,
+	0x31, 0x00, 0x30, 0x00,
+	0x30, 0x00,
+	USBD_GS_CAN_VENDOR_CODE, /* vendor code */
+	0x00                     /* padding */
 };
 
+/*  Microsoft Compatible ID Feature Descriptor  */
+static __ALIGN_BEGIN uint8_t USBD_MS_COMP_ID_FEATURE_DESC[] __ALIGN_END = {
+	0x28, 0x00, 0x00, 0x00, /* length */
+	0x00, 0x01,             /* version 1.0 */
+	0x04, 0x00,             /* descr index (0x0004) */
+	0x01,                   /* number of sections */
+	0x00, 0x00, 0x00, 0x00, /* reserved */
+	0x00, 0x00, 0x00,
+	0x00,                   /* interface number */
+	0x01,                   /* reserved */
+	0x57, 0x49, 0x4E, 0x55, /* compatible ID ("WINUSB\0\0") */
+	0x53, 0x42, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, /* sub-compatible ID */
+	0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, /* reserved */
+	0x00, 0x00
+};
+
+
 // device info
 static const struct gs_device_config USBD_GS_CAN_dconf = {
 	0, // reserved 1
@@ -433,3 +452,20 @@ uint8_t *USBD_GS_CAN_GetStrDesc(USBD_HandleTypeDef *pdev, uint8_t index, uint16_
 	}
 }
 
+bool USBD_GS_CAN_CustomDeviceRequest(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
+{
+	uint16_t len = 0;
+	uint8_t *pbuf;
+
+	if (req->bRequest == USBD_GS_CAN_VENDOR_CODE) {
+		switch (req->wIndex) {
+			case 0x0004:
+				pbuf = USBD_MS_COMP_ID_FEATURE_DESC;
+				len = sizeof(USBD_MS_COMP_ID_FEATURE_DESC);
+				USBD_CtlSendData(pdev, pbuf, MIN(len, req->wLength));
+				return true;
+		}
+	}
+
+	return false;
+}