Update Makefile to allow compilation under Linux
Fix issues with compiling under Linux