update dev branch from mac