Fix Makefile for Linux
Merge branch 'mac'