Add more targets to the Makefile
Merge branch 'makefile' into develop