fix change Alias
Merge remote-tracking branch 'origin/master'