Delete Makefile
Update Makefile
Merge branch 'master' into dev