Updating makefiles
Merge pull request #8 from meeh420/master-0.8

Updating makefiles