modify masterhong2 by ,aster
merge from master