commit by chenbin at 18/06/2014