dev branch append
merge and fixed