Updated Makefile and version.mk