some changes , 1.0.2