Improve Makefile
Merge pull request #1 from Blystad/master

Improve Makefile