Upgraded to v1.0.0