Maybe acutally works?
Clean up the makefile again.
Merge branch 'master' into works