2014-4-23 liuwu commit