changed the title and included a comment
Merge branch 'mac'