Change Makefile to work on basically all systems
Merge pull request #2 from kallies/master

Change Makefile to work on basically all systems