Makefile now detects which file to use (OSX or Linux)
Issue #82