Git sync fork

@kevgo please review
Hmm, okay