diff --git a/hardware/libraries/Servo/Servo.cpp b/hardware/libraries/Servo/Servo.cpp
index 248a215d2..ac654c3ac 100755
--- a/hardware/libraries/Servo/Servo.cpp
+++ b/hardware/libraries/Servo/Servo.cpp
@@ -53,12 +53,19 @@ void Servo::releaseTimer1() {}
 
 #define NO_ANGLE (0xff)
 
-Servo::Servo() : pin(0), angle(NO_ANGLE), min16(34), max16(150) {}
-Servo::Servo(int min, int max) : pin(0), angle(NO_ANGLE), min16(min / 16), max16(max / 16) {}
+Servo::Servo() : pin(0), angle(NO_ANGLE) {}
 
 uint8_t Servo::attach(int pinArg)
+{
+  return attach(pinArg, 544, 2400);
+}
+
+uint8_t Servo::attach(int pinArg, int min, int max)
 {
   if (pinArg != 9 && pinArg != 10) return 0;
+  
+  min16 = min / 16;
+  max16 = max / 16;
 
   pin = pinArg;
   angle = NO_ANGLE;
diff --git a/hardware/libraries/Servo/Servo.h b/hardware/libraries/Servo/Servo.h
index 59f04d9d8..0b0e8db20 100755
--- a/hardware/libraries/Servo/Servo.h
+++ b/hardware/libraries/Servo/Servo.h
@@ -36,9 +36,11 @@ class Servo
     static uint8_t attached10;
   public:
     Servo();
-    Servo(int, int); // pulse length for 0 degrees in microseconds, 540uS default
-                     // pulse length for 180 degrees in microseconds, 2400uS default
-    uint8_t attach(int);     // attach to a pin, sets pinMode, returns 0 on failure, won't
+    uint8_t attach(int);
+                             // pulse length for 0 degrees in microseconds, 544uS default
+                             // pulse length for 180 degrees in microseconds, 2400uS default
+    uint8_t attach(int, int, int);
+                             // attach to a pin, sets pinMode, returns 0 on failure, won't
                              // position the servo until a subsequent write() happens
                              // Only works for 9 and 10.
     void detach();
diff --git a/todo.txt b/todo.txt
index e7c489258..f4e2c80c4 100644
--- a/todo.txt
+++ b/todo.txt
@@ -8,8 +8,8 @@ Improve shiftOut() performance: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=
 Add String library.
 Comment LiquidCrystal examples.
 Write LiquidCrystal documentation.
-Add Arduino Nano to boards menu.
-Add Arduino Pro to boards menu.
+[done] Add Arduino Nano to boards menu.
+[done] Add Arduino Pro to boards menu.
 [done] Per-board upload.using preference.
 [done] Update version of avr-gcc, etc. to support ATmega644, ATmega328, etc.
 [done] Move #include <WProgram.h> after other #include's?  (prevent it from interfering with standard libraries)