increment version, review makefile
merged