update master brach to xiaochen.wei branch