fix bug and releas version 2.0