Improve Makefile
Merge branch 'master' into dev-en