update 1.2 by zyWu