Capitalize category
Merge branch 'category'