Git sync fork

@kevgo please review
And my repo has an upstream repo