#73 improve makefiles