Davies Liu patches #1: tianzhongbo commits

Please check this, @davies