diff --git a/device_address.c b/device_address.c
index 65e1e84..1bb9ca8 100644
--- a/device_address.c
+++ b/device_address.c
@@ -1,41 +1,46 @@
-#include "device_address.h"
-
-#define DEFAULT_MODBUS_ADDRESS (32)
-
-uint8_t EEPROM_ReadByte(uint8_t __eeprom*adr)
-{
-    while (EECR & (1<<EEWE));
-    EEAR = (uint16_t)adr;
-    EECR |= (1<<EERE);
-    return EEDR;
-}
-
-void EEPROM_WriteByte(uint8_t __eeprom*adr, uint8_t value)
-{
-    while (EECR & (1<<EEWE));
-    EEAR = (uint16_t)adr;
-    EEDR = value;
-    EECR |= (1<<EEMWE);
-    EECR |= (1<<EEWE);
-}
-
-uint8_t get_device_address(void)
-{
-    return EEPROM_ReadByte(0);
-}
-
-void write_device_address(uint8_t address)
-{
-    EEPROM_WriteByte(0, address);
-    EEPROM_WriteByte(1, ~address);
-}
-
-uint8_t get_default_address(void)
-{
-    return DEFAULT_MODBUS_ADDRESS;
-}
-
-int is_valid_device_address(void)
-{
-    return (EEPROM_ReadByte(0) ^ EEPROM_ReadByte(1) == 0xFF);
+#include "device_address.h"
+
+uint8_t EEPROM_ReadByte(uint32_t adr)
+{
+	while (EECR & (1<<EEPE));
+	EEAR = adr;
+	EECR |= (1<<EERE);
+	return EEDR;
+}
+
+void EEPROM_WriteByte(uint32_t adr, uint8_t value)
+{
+	while (EECR & (1<<EEPE));
+	EEAR = adr;
+	EEDR = value;
+	EECR |= (1<<EEMPE);
+	EECR |= (1<<EEPE);
+}
+
+uint8_t get_device_address(void)
+{
+    if(is_valid_device_address())
+    {
+        return EEPROM_ReadByte(0);
+    }
+    else
+    {
+        return get_default_address();
+    }
+}
+
+void write_device_address(uint8_t address)
+{
+    EEPROM_WriteByte(0, address);
+    EEPROM_WriteByte(1, ~address);
+}
+
+uint8_t get_default_address(void)
+{
+    return DEFAULT_MODBUS_ADDRESS;
+}
+
+int is_valid_device_address(void)
+{
+    return ((EEPROM_ReadByte(0) ^ EEPROM_ReadByte(1)) == 0xFF);
 }
\ No newline at end of file
diff --git a/device_address.h b/device_address.h
index 3e1e5c6..59c368e 100644
--- a/device_address.h
+++ b/device_address.h
@@ -1,9 +1,12 @@
-#ifndef DEVICE_ADDRESS_H
-#define DEVICE_ADDRESS_H
-
-uint8_t get_device_address(void);
-void write_device_address(uint8_t address);
-uint8_t get_default_address(void);
-int is_valid_device_address(void);
-
+#ifndef DEVICE_ADDRESS_H
+#define DEVICE_ADDRESS_H
+#include <stdint.h>
+#include <avr/io.h>
+#define DEFAULT_MODBUS_ADDRESS (32)
+
+uint8_t get_device_address(void);
+void write_device_address(uint8_t address);
+uint8_t get_default_address(void);
+int is_valid_device_address(void);
+
 #endif /*DEVICE_ADDRESS_H*/
\ No newline at end of file