updated v1.0.6