diff --git a/Devices.ino b/Devices.ino
index f349107e1..fb5d5d60b 100644
--- a/Devices.ino
+++ b/Devices.ino
@@ -19,7 +19,7 @@ void pulseinit(byte Par1)
 boolean analog(byte Par1)
 {
   boolean success = false;
-  int value = analogRead(0);
+  int value = analogRead(A0);
   UserVar[Par1 - 1] = (float)value;
   Serial.print("ADC  : Analog value: ");
   Serial.println(value);
diff --git a/ESPEasy.ino b/ESPEasy.ino
index fb8d04dac..3308c9eed 100644
--- a/ESPEasy.ino
+++ b/ESPEasy.ino
@@ -51,7 +51,7 @@
 
 #define ESP_PROJECT_PID   2015050101L
 #define VERSION           1
-#define BUILD             4
+#define BUILD             5
 
 #define UDP_LISTEN_PORT   65500
 #define REBOOT_ON_MAX_CONNECTION_FAILURES  30
@@ -138,8 +138,7 @@ void setup()
   if (Settings.Pin_i2c_sda != -1)
     {
       Serial.println("INIT : I2C");
-      Wire.pins(Settings.Pin_i2c_sda, Settings.Pin_i2c_scl);
-      Wire.begin();
+      Wire.begin(Settings.Pin_i2c_sda, Settings.Pin_i2c_scl);
     }
 
   if (Settings.Pin_wired_in_1 != -1)
diff --git a/Serial.ino b/Serial.ino
index b05dfd53e..10da1942e 100644
--- a/Serial.ino
+++ b/Serial.ino
@@ -1,18 +1,3 @@
-//********************************************************************************
-// workaround for strcasecmp, issue with lib of header files.??????
-//********************************************************************************
-int strcasecmp(const char * str1, const char * str2) {
-  int d = 0;
-  while (1) {
-    int c1 = tolower(*str1++);
-    int c2 = tolower(*str2++);
-    if (((d = c1 - c2) != 0) || (c2 == '\0')) {
-      break;
-    }
-  }
-  return d;
-}
-
 //********************************************************************************
 // Serial Interface to configure and save settings to eeprom
 //********************************************************************************
diff --git a/_ReleaseNotes.ino b/_ReleaseNotes.ino
index a6fd305de..c8c373ddc 100644
--- a/_ReleaseNotes.ino
+++ b/_ReleaseNotes.ino
@@ -29,3 +29,5 @@
 // Delayed reboot on empty IP adress (in case of DHCP issue)
 // Delayed reboot after 30 connection failures
 
+// R004 18-05-2015
+// Some fixes to be compabtible with Arduino 1.6.4 using ESP board addon 1.6.4.-628-g545ffde