Fix makefiles
Merge branch 'level7' into chat