minor changes
minor changes in Makefile
merge