Improved Makefile (used only for devel)