commit@2014-04-21 by liujiaotan