edited desc
merge from master