Bringing in 1.0.0 changes