Update & fix
Update V1.0.0