commit by liuyang 2013-12-13 9:19