Fix os name for linux
Use darwin as alternative for mac
Merge remote-tracking branch 'origin/master'