Merge pull request #11 from megax/master

Makefile update