Adding in changes for 1.0.0.