20141101 fixed some bug