Git sync fork

@kevgo please review
Sounds good