Git sync fork

@kevgo please review
This is pestering GitHub. But sure.