Issue #15: Makefile update