final commit from ubuntu
Fixing merge conflicts with changes on mac and those on ubuntu