Improve Makefile
Merge branch 'master' into dev-en
Merge branch 'dev-en' into master-en