commit from mac

Can we merge?