Fixed more Makefile issues
Merge pull request #9 from chsticksel/master

Fixed more Makefile issues