Data#40 yuanzhe->xiquan

merge from xiquan
fix bug:use wrong method