add addCategory
merge from head
fix