Clean Makefile
Merge branch 'master' into mba3,2