Makefile

Lazy merging with the nice interface ;)