Merge pull request #1 from Anttifer/master

Improved makefile + some minor corrections