Updated to work with Arduino v1.0+ (for real)