* Makefile update.
Merge pull request #18 from megax/master

Makefile update