v 1.1
fix bugs