Add the makefile
Merge branch 'makefile' into develop