changes for mac
Merge branch 'master' of https://github.com/wthibault/MoM