Updated Library to be cross-compatible between 4.2 and 4.3