v1.3, fixed some bugs