bug001 fixed
merge  bug001-fixed