Update Makefile, cleanup code and increase version number.