update ChangeLog and Makefile due to bug fixing