merge changes from csong #20

Closed garlicbulb-puzhuo closed 7 years ago