v2.1

some bug fixed