Fixed link issue, improved makefile
Merge pull request #1 from Zaffy/master

Fixed link issue, improved Makefile