* Makefile update and fix.
Merge pull request #12 from megax/master

Makefile update and fix