Add GoTo Function
Merge origin/master