fixed highlight
merge from dev
publish