combine push method fixed
Merge origin/master