bug fixed, 0.2