fix categories
Merge branch 'github-cp'