Close #50.
Merge branch 'category'