append dev4
merge & fix bug