Restore variable number of category
Merge branch 'master' of github.com:jianri/cse