Update for work on Arduino 1.5.x