ver0.2.4
merged