Updated makefile and version