Fix setup for mac
Merge branch 'Update'