Improved Makefile - assists with packaging