fix bugs, now is version 1.1