updated v1.0.8