Updated to version v1.0