diff --git a/Max3421e.h b/Max3421e.h
index cf40c5d..f3399de 100644
--- a/Max3421e.h
+++ b/Max3421e.h
@@ -3,10 +3,12 @@
 #ifndef _MAX3421E_H_
 #define _MAX3421E_H_
 
-
-//#include <Spi.h>
-//#include <WProgram.h>
-#include "WProgram.h"
+// Arduino 1.0 compatibility
+#if defined(ARDUINO) && ARDUINO >= 100
+    #include <Arduino.h>
+#else
+    #include <WProgram.h>
+#endif
 #include "Max3421e_constants.h"
 
 class MAX3421E /* : public SPI */ {
diff --git a/Max_LCD.cpp b/Max_LCD.cpp
index c09977d..5777df8 100644
--- a/Max_LCD.cpp
+++ b/Max_LCD.cpp
@@ -7,7 +7,12 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
-#include "WProgram.h"
+// Arduino 1.0 compatibility
+#if defined(ARDUINO) && ARDUINO >= 100
+    #include <Arduino.h>
+#else
+    #include <WProgram.h>
+#endif
 
 // When the display powers up, it is configured as follows:
 //
@@ -226,7 +231,12 @@ inline void Max_LCD::command(uint8_t value) {
   delayMicroseconds(100);
 }
 
+// Arduino 1.0 compatibility
+#if defined(ARDUINO) && ARDUINO >= 100
+inline size_t Max_LCD::write(uint8_t value) {
+#else
 inline void Max_LCD::write(uint8_t value) {
+#endif
   LCD_sendchar(value);
 }
 
diff --git a/Max_LCD.h b/Max_LCD.h
index c1ad45f..9e76260 100644
--- a/Max_LCD.h
+++ b/Max_LCD.h
@@ -70,7 +70,12 @@ class Max_LCD : public Print {
   void noAutoscroll();
   void createChar(uint8_t, uint8_t[]);
   void setCursor(uint8_t, uint8_t); 
+// Arduino 1.0 compatibility
+#if defined(ARDUINO) && ARDUINO >= 100
+  virtual size_t write(uint8_t);
+#else
   virtual void write(uint8_t);
+#endif
   void command(uint8_t);
 private:
   void sendbyte( uint8_t val );
@@ -84,4 +89,4 @@ class Max_LCD : public Print {
 
 
 
-#endif
\ No newline at end of file
+#endif