Updated for Arduino 1.5.x Library Spec Rev. 2.