update by xiechengxiong in 2013-6-24