Makefile simplification
Update version in Makefile