Fixing issues with makefile and dependencies
Merge pull request #2 from einhverfr/master

Fixing issues with makefile and dependencies