update changelog
branch merge
update linux Makefile
minor code comments updated