Ver 1.1

fix some bug