diff --git a/examples/stm32/CMakeLists.txt b/examples/stm32/CMakeLists.txt
index 9b6900b..5cd279f 100644
--- a/examples/stm32/CMakeLists.txt
+++ b/examples/stm32/CMakeLists.txt
@@ -48,7 +48,7 @@ target_link_directories(${CMAKE_PROJECT_NAME} PRIVATE
 # Add sources to executable
 target_sources(${CMAKE_PROJECT_NAME} PRIVATE
     # Add user sources here
-    nanomodbus_stm32.c
+    nanomodbus_port.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../../nanomodbus.c
 )
 
diff --git a/examples/stm32/Core/Src/main.c b/examples/stm32/Core/Src/main.c
index 35f6889..728f708 100644
--- a/examples/stm32/Core/Src/main.c
+++ b/examples/stm32/Core/Src/main.c
@@ -113,6 +113,8 @@ int main(void)
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */
+
+    // If you use rtos, this polling can processed in a task
     nmbs_server_poll(&nmbs);
   }
   /* USER CODE END 3 */
diff --git a/examples/stm32/nanomodbus_stm32.c b/examples/stm32/nanomodbus_port.c
similarity index 93%
rename from examples/stm32/nanomodbus_stm32.c
rename to examples/stm32/nanomodbus_port.c
index 36069e6..677bbdd 100644
--- a/examples/stm32/nanomodbus_stm32.c
+++ b/examples/stm32/nanomodbus_port.c
@@ -1,9 +1,13 @@
 #include <string.h>
-#include "nanomodbus_stm32.h"
+#include "nanomodbus_port.h"
 
 static int32_t read_serial(uint8_t* buf, uint16_t count, int32_t byte_timeout_ms, void* arg);
 static int32_t write_serial(const uint8_t* buf, uint16_t count, int32_t byte_timeout_ms, void* arg);
 
+// Dual buffer setting to isolate dma implementation and ring buffer. 
+// You may integrate this feature with dma counter register to minimize memory footprint
+static uint8_t rx_dma_buf[RX_BUF_SIZE];
+
 // Ring buffer structure definition
 typedef struct tRingBuf {
     uint8_t   data[RX_BUF_SIZE];
@@ -58,6 +62,11 @@ nmbs_error nanomodbus_server_init(nmbs_t* nmbs, nmbs_server_t* _servers, uint8_t
             return status;
         }
     }
+
+    nmbs_set_byte_timeout(nmbs, 100);
+    nmbs_set_read_timeout(nmbs, 1000);
+
+    HAL_UARTEx_ReceiveToIdle_DMA(&NANOMB_UART, rx_dma_buf, RX_BUF_SIZE);
     return NMBS_ERROR_NONE;
 }
 
@@ -221,10 +230,6 @@ static void ringbuf_overflow_error(ringBuf* rb)
     while(true){}
 }
 
-// Dual buffer setting to isolate dma implementation and ring buffer. 
-// You may integrate this feature with dma counter register to minimize memory footprint
-static uint8_t rx_dma_buf[RX_BUF_SIZE];
-
 // RX event callback from dma
 void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size)
 {
@@ -241,42 +246,27 @@ static int32_t read_serial(uint8_t* buf, uint16_t count, int32_t byte_timeout_ms
     uint32_t tick_start = HAL_GetTick();
     while(ringbuf_size(&rb) < count)
     {
-        if(HAL_GetTick() - tick_start >= byte_timeout_ms)
+        if(HAL_GetTick() - tick_start >= (uint32_t)byte_timeout_ms)
         {
-            return NMBS_ERROR_TIMEOUT;
+            uint16_t size_to_read = ringbuf_size(&rb);
+            ringbuf_get(&rb, buf, size_to_read);
+            return size_to_read;
         }
     }
     // Read from ring buffer
     if(ringbuf_get(&rb, buf, count))
     {
-        return NMBS_ERROR_NONE;
+        return count;
     }
     else
     {
-        return NMBS_ERROR_TRANSPORT;
+        return 0;
     }
 }
 
-
 static int32_t write_serial(const uint8_t* buf, uint16_t count, int32_t byte_timeout_ms, void* arg)
 {
     HAL_StatusTypeDef status = HAL_UART_Transmit_DMA(&NANOMB_UART, buf, count);
-
-    switch (status)
-    {
-    case HAL_OK:
-        return NMBS_ERROR_NONE;
-        break;
-    case HAL_ERROR:
-        return NMBS_ERROR_TRANSPORT;
-        break;
-    case HAL_BUSY:
-        return NMBS_ERROR_TRANSPORT;
-        break;
-    case HAL_TIMEOUT:
-        return NMBS_ERROR_TIMEOUT;
-        break;
-    }
-    return NMBS_ERROR_INVALID_ARGUMENT;
+    return count;
 }
 
diff --git a/examples/stm32/nanomodbus_stm32.h b/examples/stm32/nanomodbus_port.h
similarity index 100%
rename from examples/stm32/nanomodbus_stm32.h
rename to examples/stm32/nanomodbus_port.h