Sync with github and MacMac