Merge pull request #128 from bastih/master

Makefile cleanups