starting v1.1, some bug fixed