version 2.3 and some changes to Makefile