some fix
merge master