Updates for Arduino 1.0+